From owner-p4-projects@FreeBSD.ORG  Fri Sep 24 14:06:23 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D12F51065698; Fri, 24 Sep 2010 14:06:22 +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 933421065693
	for <perforce@freebsd.org>; Fri, 24 Sep 2010 14:06:22 +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 8084F8FC2B
	for <perforce@freebsd.org>; Fri, 24 Sep 2010 14:06:22 +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 o8OE6LoK051529
	for <perforce@freebsd.org>; Fri, 24 Sep 2010 14:06:21 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8OE6LWd051526
	for perforce@freebsd.org; Fri, 24 Sep 2010 14:06:21 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 24 Sep 2010 14:06:21 GMT
Message-Id: <201009241406.o8OE6LWd051526@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 184144 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:06:23 -0000

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

Change 184144 by jhb@jhb_pipkin on 2010/09/24 14:05:53

	Compile.

Affected files ...

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

Differences ...

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

@@ -1950,6 +1950,7 @@
 	ssd->ssd_gran  = sd->sd_gran;
 }
 
+#ifndef XEN
 static int
 add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
 {
@@ -2032,7 +2033,9 @@
 static void
 basemem_setup(void)
 {
+	vm_paddr_t pa;
 	pt_entry_t *pte;
+	int i;
 
 	if (basemem > 640) {
 		printf("Preposterous BIOS basemem of %uK, truncating to 640K\n",
@@ -2074,6 +2077,7 @@
 	for (i = basemem / 4; i < 160; i++)
 		pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U;
 }
+#endif
 
 /*
  * Populate the (physmap) array with base/bound pairs describing the
@@ -2091,17 +2095,21 @@
 static void
 getmemsize(int first)
 {
-	int i, off, physmap_idx, pa_indx, da_indx;
-	int hasbrokenint12, has_smap;
+	int has_smap, off, physmap_idx, pa_indx, da_indx;
 	u_long physmem_tunable;
+	vm_paddr_t physmap[PHYSMAP_SIZE];
+	pt_entry_t *pte;
+	quad_t dcons_addr, dcons_size;
+#ifndef XEN
+	int hasbrokenint12, i;
 	u_int extmem;
 	struct vm86frame vmf;
 	struct vm86context vmc;
-	vm_paddr_t pa, physmap[PHYSMAP_SIZE];
+	vm_paddr_t pa;
 	struct bios_smap *smap, *smapbase, *smapend;
 	u_int32_t smapsize;
-	quad_t dcons_addr, dcons_size;
 	caddr_t kmdp;
+#endif
 
 	has_smap = 0;
 #if defined(XEN)