x86: reserve end-of-conventional-memory to 1MB, 64-bit

[deliverable/linux.git] / arch / x86 / kernel / e820_64.c

diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index 8b914a833ac62546e7608d44c4bd1b4c1603cad0..4a0953857cb27f588e11f7c781a5f6474cd41565 100644 (file)
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -621,10 +621,10 @@ static int __init copy_e820_map(struct e820entry *biosmap, int nr_map)
                return -1;
 
        do {
-               unsigned long start = biosmap->addr;
-               unsigned long size = biosmap->size;
-               unsigned long end = start + size;
-               unsigned long type = biosmap->type;
+               u64 start = biosmap->addr;
+               u64 size = biosmap->size;
+               u64 end = start + size;
+               u32 type = biosmap->type;
 
                /* Overflow in 64 bits? Ignore the memory map. */
                if (start > end)