diff options
Diffstat (limited to 'arch/x86/kernel/resource.c')
-rw-r--r-- | arch/x86/kernel/resource.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/resource.c b/arch/x86/kernel/resource.c index 2a26819bb6a8..80eab01c1a68 100644 --- a/arch/x86/kernel/resource.c +++ b/arch/x86/kernel/resource.c | |||
@@ -37,10 +37,12 @@ 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 areas (low 1MB and high 2MB) and E820 regions */ | 40 | /* |
41 | * Trim out BIOS area (high 2MB) and E820 regions. We do not remove | ||
42 | * the low 1MB unconditionally, as this area is needed for some ISA | ||
43 | * cards requiring a memory range, e.g. the i82365 PCMCIA controller. | ||
44 | */ | ||
41 | if (avail->flags & IORESOURCE_MEM) { | 45 | if (avail->flags & IORESOURCE_MEM) { |
42 | if (avail->start < BIOS_END) | ||
43 | avail->start = BIOS_END; | ||
44 | resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END); | 46 | resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END); |
45 | 47 | ||
46 | remove_e820_regions(avail); | 48 | remove_e820_regions(avail); |