From owner-p4-projects@FreeBSD.ORG  Fri Sep 24 14:29:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AACCD1065674; Fri, 24 Sep 2010 14:29:25 +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 6D1811065672
	for <perforce@freebsd.org>; Fri, 24 Sep 2010 14:29:25 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A8568FC08
	for <perforce@freebsd.org>; Fri, 24 Sep 2010 14:29:25 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8OETPWo056761
	for <perforce@freebsd.org>; Fri, 24 Sep 2010 14:29:25 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8OETPhQ056758
	for perforce@freebsd.org; Fri, 24 Sep 2010 14:29:25 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 24 Sep 2010 14:29:25 GMT
Message-Id: <201009241429.o8OETPhQ056758@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 184145 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 24 Sep 2010 14:29:25 -0000

http://p4web.freebsd.org/@@184145?ac=10

Change 184145 by jhb@jhb_jhbbsd on 2010/09/24 14:28:21

	Initialize physmap_idx before parsing the SMAP from the loader.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/machdep.c#159 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/machdep.c#159 (text+ko) ====

@@ -2140,6 +2140,7 @@
 	 * Check if the loader supplied an SMAP memory map.  If so,
 	 * use that and do not make any VM86 calls.
 	 */
+	physmap_idx = 0;
 	smapbase = NULL;
 	kmdp = preload_search_by_type("elf kernel");
 	if (kmdp == NULL)
@@ -2182,7 +2183,6 @@
 	 * the kernel page table so we can use it as a buffer.  The
 	 * kernel will unmap this page later.
 	 */
-	physmap_idx = 0;
 	pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1 << PAGE_SHIFT);
 	vmc.npages = 0;
 	smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT));