diff options
author | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-06-30 19:23:16 +0000 |
---|---|---|
committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-06-30 19:23:16 +0000 |
commit | 04370749174e4a61979c8a8ff1d6e1e04da02c8d (patch) | |
tree | 930ee413a3c2f1b65a4d4d1d0787028a8b44ed10 /sys | |
parent | 32008132522f5c1a91e678938af92640f5a90721 (diff) |
amd64_pa_used is weird.
We check a bunch of things, where most archs are a lot more simple.
Also, we get problems sometimes: My x201 can't map the framebuffer BAR
from the aperture with the chunk that checks the bios sections, meaning
the bios is claiming something about it.
Kettenis@ and I are pretty sure that the rest of the checks are more than
sufficient, so just nuke that one.
for the record, in the same situation i386 just checks again VGA_START,
BIOS_END and physmem.
ok kettenis@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index c8967560102..4600f35bbd6 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.113 2010/06/27 13:28:46 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.114 2010/06/30 19:23:15 oga Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1669,7 +1669,6 @@ int amd64_pa_used(paddr_t addr) { struct vm_page *pg; - bios_memmap_t *bmp; /* Kernel manages these */ if ((pg = PHYS_TO_VM_PAGE(addr)) && (pg->pg_flags & PG_DEV) == 0) @@ -1679,13 +1678,6 @@ amd64_pa_used(paddr_t addr) if (addr > IOM_END && addr < (kern_end - KERNBASE)) return 1; - /* Memory is otherwise reserved */ - for (bmp = bios_memmap; bmp->type != BIOS_MAP_END; bmp++) { - if (addr > bmp->addr && addr < (bmp->addr + bmp->size) && - bmp->type != BIOS_MAP_FREE) - return 1; - } - /* Low memory used for various bootstrap things */ if (addr >= 0 && addr < avail_start) return 1; |