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:
Коммит
c7f5f4ab10
|
@ -27,7 +27,7 @@
|
||||||
#define PANIC_TIMER_STEP 100
|
#define PANIC_TIMER_STEP 100
|
||||||
#define PANIC_BLINK_SPD 18
|
#define PANIC_BLINK_SPD 18
|
||||||
|
|
||||||
int panic_on_oops;
|
int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;
|
||||||
static unsigned long tainted_mask;
|
static unsigned long tainted_mask;
|
||||||
static int pause_on_oops;
|
static int pause_on_oops;
|
||||||
static int pause_on_oops_flag;
|
static int pause_on_oops_flag;
|
||||||
|
@ -108,8 +108,6 @@ void panic(const char *fmt, ...)
|
||||||
*/
|
*/
|
||||||
crash_kexec(NULL);
|
crash_kexec(NULL);
|
||||||
|
|
||||||
kmsg_dump(KMSG_DUMP_PANIC);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Note smp_send_stop is the usual smp shutdown function, which
|
* Note smp_send_stop is the usual smp shutdown function, which
|
||||||
* unfortunately means it may not be hardened to work in a panic
|
* unfortunately means it may not be hardened to work in a panic
|
||||||
|
@ -117,6 +115,8 @@ void panic(const char *fmt, ...)
|
||||||
*/
|
*/
|
||||||
smp_send_stop();
|
smp_send_stop();
|
||||||
|
|
||||||
|
kmsg_dump(KMSG_DUMP_PANIC);
|
||||||
|
|
||||||
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
|
atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
|
||||||
|
|
||||||
bust_spinlocks(0);
|
bust_spinlocks(0);
|
||||||
|
|
|
@ -241,6 +241,26 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
|
||||||
default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC
|
default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC
|
||||||
default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
|
default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
|
||||||
|
|
||||||
|
config PANIC_ON_OOPS
|
||||||
|
bool "Panic on Oops" if EXPERT
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Say Y here to enable the kernel to panic when it oopses. This
|
||||||
|
has the same effect as setting oops=panic on the kernel command
|
||||||
|
line.
|
||||||
|
|
||||||
|
This feature is useful to ensure that the kernel does not do
|
||||||
|
anything erroneous after an oops which could result in data
|
||||||
|
corruption or other issues.
|
||||||
|
|
||||||
|
Say N if unsure.
|
||||||
|
|
||||||
|
config PANIC_ON_OOPS_VALUE
|
||||||
|
int
|
||||||
|
range 0 1
|
||||||
|
default 0 if !PANIC_ON_OOPS
|
||||||
|
default 1 if PANIC_ON_OOPS
|
||||||
|
|
||||||
config DETECT_HUNG_TASK
|
config DETECT_HUNG_TASK
|
||||||
bool "Detect Hung Tasks"
|
bool "Detect Hung Tasks"
|
||||||
depends on DEBUG_KERNEL
|
depends on DEBUG_KERNEL
|
||||||
|
|
Загрузка…
Ссылка в новой задаче