diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-06-06 11:12:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 11:12:55 +0200 |
| commit | c7f5f4ab10ce4e05b9f8877f1fd112faba71f175 (patch) | |
| tree | f4e09bf621f0201283167f17f2b33461042cc1a7 /kernel | |
| parent | Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras (diff) | |
| parent | kdump: Execute kmsg_dump(KMSG_DUMP_PANIC) after smp_send_stop() (diff) | |
| download | linux-dev-c7f5f4ab10ce4e05b9f8877f1fd112faba71f175.tar.xz linux-dev-c7f5f4ab10ce4e05b9f8877f1fd112faba71f175.zip | |
Merge branch 'core/debug' into core/urgent
Merge two debugging patchlets that were waiting for
preparatory commits to hit upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/panic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 8ed89a175d79..d2a5f4ecc6dd 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -27,7 +27,7 @@ #define PANIC_TIMER_STEP 100 #define PANIC_BLINK_SPD 18 -int panic_on_oops; +int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE; static unsigned long tainted_mask; static int pause_on_oops; static int pause_on_oops_flag; @@ -108,8 +108,6 @@ void panic(const char *fmt, ...) */ crash_kexec(NULL); - kmsg_dump(KMSG_DUMP_PANIC); - /* * Note smp_send_stop is the usual smp shutdown function, which * unfortunately means it may not be hardened to work in a panic @@ -117,6 +115,8 @@ void panic(const char *fmt, ...) */ smp_send_stop(); + kmsg_dump(KMSG_DUMP_PANIC); + atomic_notifier_call_chain(&panic_notifier_list, 0, buf); bust_spinlocks(0); |