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>
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user