---

yaml --- r: 234808 b: refs/heads/master c: 77eed82 h: refs/heads/master v: v3
git-mirror · Feb 14, 2011 · 5c52b05 · 5c52b05
1 parent 036213a
commit 5c52b05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;