From 7e49b690038da8b3a2e37a63bf31932dafc70c5a Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 5 Jul 2008 15:53:39 +0400
Subject: [PATCH] --- yaml --- r: 100039 b: refs/heads/master c:
 a737abd11ac4eb9f4226fa8c9f1d9b5be12a96c1 h: refs/heads/master i:   100037:
 1def7b7dea15c2f9886dcf5a8e0806f931c8d111   100035:
 6361e6d10bf94ee08c3712b5458500541c8e7274   100031:
 256a2f1b99b1e5ac6addb6afee750544d14715db 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 db43705d4c8c..9b1c72817ff0 100644
--- 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
index 292ebc7fe4d0..66fd5bd78318 100644
--- 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
 		/*