diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/e820.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index fa77cb4185c..ba5ac880ea1 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -1202,6 +1202,7 @@ void __init e820_reserve_resources(void) { int i; struct resource *res; + u64 end; res = alloc_bootmem_low(sizeof(struct resource) * e820.nr_map); for (i = 0; i < e820.nr_map; i++) { @@ -1211,14 +1212,16 @@ void __init e820_reserve_resources(void) case E820_NVS: res->name = "ACPI Non-volatile Storage"; break; default: res->name = "reserved"; } - res->start = e820.map[i].addr; - res->end = res->start + e820.map[i].size - 1; + end = e820.map[i].addr + e820.map[i].size - 1; #ifndef CONFIG_RESOURCES_64BIT - if (res->end > 0x100000000ULL) { + if (end > 0x100000000ULL) { res++; continue; } #endif + res->start = e820.map[i].addr; + res->end = end; + res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; insert_resource(&iomem_resource, res); res++; |