Date: Fri, 24 Sep 2010 14:06:21 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 184144 for review Message-ID: <201009241406.o8OE6LWd051526@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009241406.o8OE6LWd051526>