From owner-p4-projects@FreeBSD.ORG  Tue Nov 13 20:32:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA13916A41A; Tue, 13 Nov 2007 20:32:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9BB8216A417
	for <perforce@freebsd.org>; Tue, 13 Nov 2007 20:32:12 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9018713C459
	for <perforce@freebsd.org>; Tue, 13 Nov 2007 20:32:12 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lADKWCjb042627
	for <perforce@freebsd.org>; Tue, 13 Nov 2007 20:32:12 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lADKWCpm042624
	for perforce@freebsd.org; Tue, 13 Nov 2007 20:32:12 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 13 Nov 2007 20:32:12 GMT
Message-Id: <200711132032.lADKWCpm042624@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 129038 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2007 20:32:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=129038

Change 129038 by peter@peter_overcee on 2007/11/13 20:31:55

	Fix off-by-one in pmap.h that caused a lockup at boot.
	Cosmetic tweaks.

Affected files ...

.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#70 edit
.. //depot/projects/hammer/sys/i386/include/pmap.h#32 edit

Differences ...

==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#70 (text+ko) ====

@@ -506,11 +506,10 @@
 	/* Get per-cpu data */
 	pc = &__pcpu[myid];
 
-	/* prime data pabe or it to use */
+	/* prime data page for it to use */
 	pcpu_init(pc, myid, sizeof(struct pcpu));
 	pc->pc_apic_id = cpu_apic_ids[myid];
 	pc->pc_prvspace = pc;
-	pc->pc_curthread = 0;
 
 	gdt_segs[GPRIV_SEL].ssd_base = (int) pc;
 	gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss;
@@ -763,7 +762,7 @@
 	for (cpu = 1; cpu < mp_ncpus; cpu++) {
 		apic_id = cpu_apic_ids[cpu];
 
-		/* allocate and set up an idle stack data page */
+		/* allocate and set up a boot stack data page */
 		bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE);
 
 		/* setup a vector to our boot code */
@@ -803,6 +802,7 @@
 	outb(CMOS_DATA, mpbiosreason);
 #endif
 
+	/* Clear out V==P hack for mpboot above */
 	for (i = 0; i < NKPT; i++)
 		PTD[i] = 0;
 	pmap_invalidate_range(kernel_pmap, 0, NKPT * NBPDR - 1);

==== //depot/projects/hammer/sys/i386/include/pmap.h#32 (text+ko) ====

@@ -121,12 +121,8 @@
 #endif
 
 #ifndef NKPDE
-#ifdef SMP
-#define NKPDE	(KVA_PAGES - 1) /* number of page tables/pde's */
-#else
 #define NKPDE	(KVA_PAGES)	/* number of page tables/pde's */
 #endif
-#endif
 
 /*
  * The *PTDI values control the layout of virtual memory