aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenzhong Duan <zhenzhong.duan@oracle.com>2012-03-28 17:42:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 20:14:36 -0400
commiteaa3be6add6f327ab0a633e4fee8e6f2cc8c8a4c (patch)
tree033e1ac064eb855369246404dd1603b41eb64d27
parentd034cfab4f7b9e768c5c1caaa56c5bd4805d2b92 (diff)
kexec: add further check to crashkernel
When using crashkernel=2M-256M, the kernel doesn't give any warning. This is misleading sometimes. Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/kexec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 769e347c5196..3288c9b29bae 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1359,6 +1359,10 @@ static int __init parse_crashkernel_simple(char *cmdline,
1359 1359
1360 if (*cur == '@') 1360 if (*cur == '@')
1361 *crash_base = memparse(cur+1, &cur); 1361 *crash_base = memparse(cur+1, &cur);
1362 else if (*cur != ' ' && *cur != '\0') {
1363 pr_warning("crashkernel: unrecognized char\n");
1364 return -EINVAL;
1365 }
1362 1366
1363 return 0; 1367 return 0;
1364} 1368}