From 486c5a829f5b63850d86361c331505154aa59868 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 16 Dec 2010 10:39:02 -0700 Subject: [PATCH] --- yaml --- r: 223418 b: refs/heads/master c: a2c606d53ab71dee6410f10ef0adf67321d60e06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/e820.h | 3 +++ trunk/arch/x86/kernel/resource.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d75fa2655f46..13ef5fad6563 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dc2287c1805e7fe8a7cb90bbcd44abee8cdb914 +refs/heads/master: a2c606d53ab71dee6410f10ef0adf67321d60e06 diff --git a/trunk/arch/x86/include/asm/e820.h b/trunk/arch/x86/include/asm/e820.h index 5be1542fbfaf..e99d55d74df5 100644 --- a/trunk/arch/x86/include/asm/e820.h +++ b/trunk/arch/x86/include/asm/e820.h @@ -72,6 +72,9 @@ struct e820map { #define BIOS_BEGIN 0x000a0000 #define BIOS_END 0x00100000 +#define BIOS_ROM_BASE 0xffe00000 +#define BIOS_ROM_END 0xffffffff + #ifdef __KERNEL__ /* see comment in arch/x86/kernel/e820.c */ extern struct e820map e820; diff --git a/trunk/arch/x86/kernel/resource.c b/trunk/arch/x86/kernel/resource.c index 89638af2ff19..2a26819bb6a8 100644 --- a/trunk/arch/x86/kernel/resource.c +++ b/trunk/arch/x86/kernel/resource.c @@ -37,10 +37,11 @@ static void remove_e820_regions(struct resource *avail) void arch_remove_reservations(struct resource *avail) { - /* Trim out BIOS area (low 1MB) and E820 regions */ + /* Trim out BIOS areas (low 1MB and high 2MB) and E820 regions */ if (avail->flags & IORESOURCE_MEM) { if (avail->start < BIOS_END) avail->start = BIOS_END; + resource_clip(avail, BIOS_ROM_BASE, BIOS_ROM_END); remove_e820_regions(avail); }