x86: limit E820 map when a user-defined memory map is specified

This patch brings back limiting of the E820 map when a user-defined
E820 map is specified. While the behaviour of i386 (32 bit) was to limit
the E820 map (and /proc/iomem), the behaviour of x86-64 (64 bit) was not to
limit.

That patch limits the E820 map again for both x86 architectures.

Code was tested for compilation and booting on a 32 bit and 64 bit system.

Signed-off-by: Bernhard Walle <[email protected]>
Acked-by: Yinghai Lu <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Bernhard Walle <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 1dcb66533dfcbb50fa801c5b35e2c05fabe4a472..7b7685b78852408abd56819fdbfdf983aa905b78 100644 (file)
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1117,6 +1117,9 @@ static int __init parse_memopt(char *p)
 
        mem_size = memparse(p, &p);
        end_user_pfn = mem_size>>PAGE_SHIFT;
+       e820_update_range(mem_size, ULLONG_MAX - mem_size,
+               E820_RAM, E820_RESERVED);
+
        return 0;
 }
 early_param("mem", parse_memopt);
@@ -1161,6 +1164,8 @@ static int __init parse_memmap_opt(char *p)
                e820_add_region(start_at, mem_size, E820_RESERVED);
        } else {
                end_user_pfn = (mem_size >> PAGE_SHIFT);
+               e820_update_range(mem_size, ULLONG_MAX - mem_size,
+                       E820_RAM, E820_RESERVED);
        }
        return *p == '\0' ? 0 : -EINVAL;
 }