From owner-svn-src-projects@FreeBSD.ORG  Mon Nov 15 21:41:33 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3ADD106564A;
	Mon, 15 Nov 2010 21:41:32 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E28D68FC15;
	Mon, 15 Nov 2010 21:41:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAFLfWjk029390;
	Mon, 15 Nov 2010 21:41:32 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAFLfWwo029387;
	Mon, 15 Nov 2010 21:41:32 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201011152141.oAFLfWwo029387@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 15 Nov 2010 21:41:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215347 - in projects/sbruno_64cpus/sys/amd64: amd64
	include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Nov 2010 21:41:33 -0000

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