From 5c52b059772f96d666d7ccca1fd81d5834750532 Mon Sep 17 00:00:00 2001
From: Kamal Mostafa <kamal@canonical.com>
Date: Thu, 3 Feb 2011 17:38:04 -0800
Subject: [PATCH] --- yaml --- r: 234808 b: refs/heads/master c:
 77eed821accf5dd962b1f13bed0680e217e49112 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/e820.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99d6a55b7d85..99653f0de596 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7064d865af804b9b841e7b9a3e9b653e40c3e5ca
+refs/heads/master: 77eed821accf5dd962b1f13bed0680e217e49112
diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c
index 294f26da0c0c..55a59d889dbd 100644
--- a/trunk/arch/x86/kernel/e820.c
+++ b/trunk/arch/x86/kernel/e820.c
@@ -856,6 +856,9 @@ static int __init parse_memopt(char *p)
 
 	userdef = 1;
 	mem_size = memparse(p, &p);
+	/* don't remove all of memory when handling "mem={invalid}" param */
+	if (mem_size == 0)
+		return -EINVAL;
 	e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
 
 	return 0;