diff options
| author | jhb <jhb@FreeBSD.org> | 2010-11-02 17:56:16 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2010-11-02 17:56:16 +0000 |
| commit | 5de2d0587227f6acbb1a2aa1aaa368f1e45b9865 (patch) | |
| tree | 815ae839607f9ba726dd39cddc9a3bc42f2598dd /sys/i386 | |
| parent | 568dc19750ccec553ab3df463967352da528cd93 (diff) | |
| download | FreeBSD-src-5de2d0587227f6acbb1a2aa1aaa368f1e45b9865.zip FreeBSD-src-5de2d0587227f6acbb1a2aa1aaa368f1e45b9865.tar.gz | |
Further tweaks to the ram_attach() routine:
- Use > 2^32 - 1 instead of >= when checking for memory regions above 4G.
- Skip SMAP entries > 4G on i386 rather than breaking out of the loop
since SMAP entries are not guaranteed to be in order.
- Remove 'i' and loop over 'rid' directly in the dump_avail[] case.
- Only check for 4G regions in the dump_avail[] case on i386 if PAE is
enabled since vm_paddr_t is 32-bit in the !PAE case.
Submitted by: alc
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/machdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 255bec6..4901b38 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1970,7 +1970,7 @@ add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp) return (1); #ifndef PAE - if (smap->base >= 0xffffffff) { + if (smap->base > 0xffffffff) { printf("%uK of memory above 4GB ignored\n", (u_int)(smap->length / 1024)); return (1); |
