From 7af6890bb2e6003f8b92be13863ba050f10e1264 Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Wed, 25 Jun 2008 21:39:16 +0200 Subject: [PATCH] --- yaml --- r: 99968 b: refs/heads/master c: 611dfd7819e525b45f39ff15e0faf5f23551c113 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/e820.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4158c9bfec57..07077d68eeef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8207c2570af6f819b61be9ef3fb298d0a8c0e18c +refs/heads/master: 611dfd7819e525b45f39ff15e0faf5f23551c113 diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c index 1dcb66533dfc..7b7685b78852 100644 --- a/trunk/arch/x86/kernel/e820.c +++ b/trunk/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; }