diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
| commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
| tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /kernel/panic.c | |
| parent | 883ae7992c09435927dda642b61f1455fceb5b85 (diff) | |
| parent | bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 991bb87a170..69231670eb9 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -433,3 +433,13 @@ EXPORT_SYMBOL(__stack_chk_fail); core_param(panic, panic_timeout, int, 0644); core_param(pause_on_oops, pause_on_oops, int, 0644); + +static int __init oops_setup(char *s) +{ + if (!s) + return -EINVAL; + if (!strcmp(s, "panic")) + panic_on_oops = 1; + return 0; +} +early_param("oops", oops_setup); |