diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/e820.h | 3 | ||||
-rw-r--r-- | arch/x86/kernel/resource.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h index 5be1542fbfaf..e99d55d74df5 100644 --- a/arch/x86/include/asm/e820.h +++ b/arch/x86/include/asm/e820.h | |||
@@ -72,6 +72,9 @@ struct e820map { | |||
72 | #define BIOS_BEGIN 0x000a0000 | 72 | #define BIOS_BEGIN 0x000a0000 |
73 | #define BIOS_END 0x00100000 | 73 | #define BIOS_END 0x00100000 |
74 | 74 | ||
75 | #define BIOS_ROM_BASE 0xffe00000 | ||
76 | #define BIOS_ROM_END 0xffffffff | ||
77 | |||
75 | #ifdef __KERNEL__ | 78 | #ifdef __KERNEL__ |
76 | /* see comment in arch/x86/kernel/e820.c */ | 79 | /* see comment in arch/x86/kernel/e820.c */ |
77 | extern struct e820map e820; | 80 | extern struct e820map e820; |
diff --git a/arch/x86/kernel/resource.c b/arch/x86/kernel/resource.c index 89638af2ff19..2a26819bb6a8 100644 --- a/arch/x86/kernel/resource.c +++ b/arch/x86/kernel/resource.c | |||
@@ -37,10 +37,11 @@ static void remove_e820_regions(struct resource *avail) | |||
37 | 37 | ||
38 | void arch_remove_reservations(struct resource *avail) | 38 | void arch_remove_reservations(struct resource *avail) |
39 | { | 39 | { |
40 | /* Trim out BIOS area (low 1MB) and E820 regions */ | 40 | /* Trim out BIOS areas (low 1MB and high 2MB) and E820 regions */ |
41 | if (avail->flags & IORESOURCE_MEM) { | 41 | if (avail->flags & IORESOURCE_MEM) { |
42 | if (avail->start < BIOS_END) | 42 | if (avail->start < BIOS_END) |
43 | avail->start = BIOS_END; | 43 | avail->start = BIOS_END; |
44 | resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END); | ||
44 | 45 | ||
45 | remove_e820_regions(avail); | 46 | remove_e820_regions(avail); |
46 | } | 47 | } |