svn commit: r215347 - in projects/sbruno_64cpus/sys/amd64: amd64 include

[Sean Bruno]

Author: sbruno
Date: Mon Nov 15 21:41:32 2010
New Revision: 215347
URL: http://svn.freebsd.org/changeset/base/215347

Log:
  Bump MAXCPU to 64 after alc@ pointed out that cpu_switch.S was plain wrong.

Modified:
  projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S
  projects/sbruno_64cpus/sys/amd64/include/param.h

Modified: projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S
==============================================================================
--- projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S	Mon Nov 15 21:19:50 2010	(r215346)
+++ projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S	Mon Nov 15 21:41:32 2010	(r215347)
@@ -74,7 +74,7 @@ ENTRY(cpu_throw)
 	jz	1f
 	/* release bit from old pm_active */
 	movq	PCPU(CURPMAP),%rdx
-	LK btrq	%rax,VM_PMAP+PM_ACTIVE(%rdx)		/* clear old */
+	LK btrq	%rax,PM_ACTIVE(%rdx)		/* clear old */
 1:
 	movq	TD_PCB(%rsi),%r8		/* newtd->td_proc */
 	movq	PCB_CR3(%r8),%rdx
@@ -138,14 +138,14 @@ swinact:
 	movl	PCPU(CPUID), %eax
 	/* Release bit from old pmap->pm_active */
 	movq	PCPU(CURPMAP),%rcx
-	LK btrq	%rax,VM_PMAP+PM_ACTIVE(%rcx)		/* clear old */
+	LK btrq	%rax,PM_ACTIVE(%rcx)		/* clear old */
 	SETLK	%rdx, TD_LOCK(%rdi)		/* Release the old thread */
 swact:
 	/* Set bit in new pmap->pm_active */
 	movq	TD_PROC(%rsi),%rdx		/* newproc */
 	movq	P_VMSPACE(%rdx), %rdx
 	addq	$VM_PMAP,%rdx
-	LK btsq	%rax,VM_PMAP+PM_ACTIVE(%rdx)		/* set new */
+	LK btsq	%rax,PM_ACTIVE(%rdx)		/* set new */
 	movq	%rdx,PCPU(CURPMAP)
 
 sw1:

Modified: projects/sbruno_64cpus/sys/amd64/include/param.h
==============================================================================
--- projects/sbruno_64cpus/sys/amd64/include/param.h	Mon Nov 15 21:19:50 2010	(r215346)
+++ projects/sbruno_64cpus/sys/amd64/include/param.h	Mon Nov 15 21:41:32 2010	(r215347)
@@ -64,7 +64,7 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
-#define MAXCPU		32
+#define MAXCPU		64
 #else
 #define MAXCPU		1
 #endif