---

yaml --- r: 100039 b: refs/heads/master c: a737abd h: refs/heads/master i: 100037: 1def7b7 100035: 6361e6d 100031: 256a2f1 v: v3
git-mirror · Jul 9, 2008 · 7e49b69 · 7e49b69
1 parent 11d3cc5
commit 7e49b69
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: c22d4c1885130db9c07f6441ab461208a1ba16b2
+refs/heads/master: a737abd11ac4eb9f4226fa8c9f1d9b5be12a96c1
diff --git a/trunk/arch/x86/kernel/e820.c b/trunk/arch/x86/kernel/e820.c
@@ -1198,6 +1198,9 @@ static int __init parse_memmap_opt(char *p)
 	char *oldp;
 	u64 start_at, mem_size;
 
+	if (!p)
+		return -EINVAL;
+
 	if (!strcmp(p, "exactmap")) {
 #ifdef CONFIG_CRASH_DUMP
 		/*