diff --git a/[refs] b/[refs]
index f8561b1c3774..10e06b2d991f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d034cfab4f7b9e768c5c1caaa56c5bd4805d2b92
+refs/heads/master: eaa3be6add6f327ab0a633e4fee8e6f2cc8c8a4c
diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c
index 769e347c5196..3288c9b29bae 100644
--- a/trunk/kernel/kexec.c
+++ b/trunk/kernel/kexec.c
@@ -1359,6 +1359,10 @@ static int __init parse_crashkernel_simple(char 		*cmdline,
 
 	if (*cur == '@')
 		*crash_base = memparse(cur+1, &cur);
+	else if (*cur != ' ' && *cur != '\0') {
+		pr_warning("crashkernel: unrecognized char\n");
+		return -EINVAL;
+	}
 
 	return 0;
 }