x86, nmi watchdog: Fixes from removing old nmi watchdog
Subsystems (3)
cover x86, nmi watchdog: Fixes from removing old nmi watchdog
A couple of small fixes to address issues caused by removing the old nmi watchdog
Applied on top of Ingo's latest master branch.
Don Zickus (2):
lockup detector: Compile fixes from removing the old x86 nmi
watchdog
x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
Documentation/kernel-parameters.txt | 10 +--------- arch/x86/kernel/apic/hw_nmi.c | 12 ++++++++---- arch/x86/kernel/traps.c | 16 +++++++++++----- include/linux/nmi.h | 4 +++- kernel/sysctl.c | 16 ++++++++++++++++ kernel/sysctl_binary.c | 1 - kernel/watchdog.c | 2 ++ 7 files changed, 41 insertions(+), 20 deletions(-)
Signature · 1 line
1.7.3.2
PATCH 1/2 lockup detector: Compile fixes from removing the old x86 nmi watchdog
My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot.
--- arch/x86/kernel/apic/hw_nmi.c | 9 ++++++++- include/linux/nmi.h | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-)
arch/x86/kernel/apic/hw_nmi.c +8 -1
@@ -24,11 +24,18 @@ u64 hw_nmi_get_sample_period(void) }#endif +#ifndef CONFIG_HARDLOCKUP_DETECTOR +void touch_nmi_watchdog (void ) +{ +touch_softlockup_watchdog (); +} +EXPORT_SYMBOL (touch_nmi_watchdog); +#endif +#ifdef arch_trigger_all_cpu_backtrace/* For reliability, we're prepared to waste bits here. */ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly; -#ifdef arch_trigger_all_cpu_backtracevoid arch_trigger_all_cpu_backtrace (void ) {int i;
include/linux/nmi.h +3 -1
@@ -16,7 +16,8 @@*/ #ifdef ARCH_HAS_NMI_WATCHDOG #include <asm/nmi.h> -#endif +extern void touch_nmi_watchdog(void); +#else #ifndef CONFIG_HARDLOCKUP_DETECTOR static inline void touch_nmi_watchdog(void) {
@@ -25,6 +26,7 @@ static inline void touch_nmi_watchdog(void)#else extern void touch_nmi_watchdog (void );#endif +#endif /* * Create trigger_all_cpu_backtrace() out of the arch-provided
Signature · 1 line
1.7.3.2
Re: [PATCH 1/2] lockup detector: Compile fixes from removing the old x86 nmi watchdog
Quoted 9 lines · Don Zickus
My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot.
Signed-off-by Don Zickus <[email protected]>--- arch/x86/kernel/apic/hw_nmi.c | 9 ++++++++- include/linux/nmi.h | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-)
Looks good to me, thanks Don!
[tip:perf/core] lockup detector: Compile fixes from removing the old x86 nmi watchdog
In reply to Don ZickusCommit-ID: 96a84c20d635fb1e98ab92f9fc517c4441f5c424 Gitweb: http://git.kernel.org/tip/96a84c20d635fb1e98ab92f9fc517c4441f5c424 Author: Don Zickus <[email protected]> AuthorDate: Mon, 29 Nov 2010 17:07:16 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 10 Dec 2010 00:01:06 +0100
lockup detector: Compile fixes from removing the old x86 nmi watchdog
My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/apic/hw_nmi.c | 8 +++++++- include/linux/nmi.h | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-)
arch/x86/kernel/apic/hw_nmi.c +7 -1
@@ -24,8 +24,14 @@ u64 hw_nmi_get_sample_period(void) }#endif +#ifndef CONFIG_HARDLOCKUP_DETECTOR +void touch_nmi_watchdog (void ) +{ +touch_softlockup_watchdog (); +} +EXPORT_SYMBOL (touch_nmi_watchdog); +#endif #ifdef arch_trigger_all_cpu_backtrace -/* For reliability, we're prepared to waste bits here. */ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
include/linux/nmi.h +3 -1
@@ -16,7 +16,8 @@*/ #ifdef ARCH_HAS_NMI_WATCHDOG #include <asm/nmi.h> -#endif +extern void touch_nmi_watchdog(void); +#else #ifndef CONFIG_HARDLOCKUP_DETECTOR static inline void touch_nmi_watchdog(void) {
@@ -25,6 +26,7 @@ static inline void touch_nmi_watchdog(void)#else extern void touch_nmi_watchdog (void );#endif +#endif /* * Create trigger_all_cpu_backtrace() out of the arch-provided
PATCH 2/2 x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
In reply to Don ZickusOriginally adapted from Huang Ying's patch which moved the unknown_nmi_panic to the traps.c file. Because the old nmi watchdog was deleted before this change happened, the unknown_nmi_panic sysctl was lost. This re-adds it.
Also, the nmi_watchdog sysctl was re-implemented and its documentation updated accordingly.
--- Documentation/kernel-parameters.txt | 10 +--------- arch/x86/kernel/apic/hw_nmi.c | 3 --- arch/x86/kernel/traps.c | 16 +++++++++++----- kernel/sysctl.c | 16 ++++++++++++++++ kernel/sysctl_binary.c | 1 - kernel/watchdog.c | 2 ++ 6 files changed, 30 insertions(+), 18 deletions(-)
Documentation/kernel-parameters.txt +1 -9
@@ -1579,20 +1579,12 @@ and is between 256 and 4096 characters. It is defined in the file nmi_watchdog= [KNL,BUGS=X86] Debugging features for SMP kernels Format: [panic,][num] - Valid num: 0,1,2 + Valid num: 0 0 - turn nmi_watchdog off - 1 - use the IO-APIC timer for the NMI watchdog - 2 - use the local APIC for the NMI watchdog using - a performance counter. Note: This will use one - performance counter and the local APIC's performance - vector. When panic is specified, panic when an NMI watchdog timeout occurs. This is useful when you use a panic=... timeout and need the box quickly up again. - Instead of 1 and 2 it is possible to use the following - symbolic names: lapic and ioapic - Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic netpoll.carrier_timeout= [NET] Specifies amount of time (in seconds) that
arch/x86/kernel/apic/hw_nmi.c +0 -3
@@ -100,6 +100,3 @@ static int __init register_trigger_all_cpu_backtrace(void) }early_initcall (register_trigger_all_cpu_backtrace);#endif - -/* STUB calls to mimic old nmi_watchdog behaviour */ -int unknown_nmi_panic;
arch/x86/kernel/traps.c +11 -5
@@ -83,6 +83,8 @@ EXPORT_SYMBOL_GPL(used_vectors);static int ignore_nmis; +int unknown_nmi_panic; +static inline void conditional_sti (struct pt_regs *regs) {if (regs->flags &X86_EFLAGS_IF )
@@ -300,6 +302,13 @@ gp_in_kernel:die ("general protection fault" , regs, error_code); } +static int __init setup_unknown_nmi_panic (char *str) +{ + unknown_nmi_panic =1 ; +return 1 ; +} +__setup ("unknown_nmi_panic" , setup_unknown_nmi_panic); + static notrace __kprobes voidmem_parity_error (unsigned char reason,struct pt_regs *regs) {
@@ -371,7 +380,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) reason, smp_processor_id());printk (KERN_EMERG "Do you have a strange power saving mode enabled?\n" ); -if (panic_on_unrecovered_nmi) +if (unknown_nmi_panic || panic_on_unrecovered_nmi)panic ("NMI: Not continuing" );printk (KERN_EMERG "Dazed and confused, but trying to continue\n" );
@@ -397,11 +406,8 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)if (notify_die (DIE_NMI ,"nmi" , regs, reason,2 ,SIGINT ) ==NOTIFY_STOP )return ; - -unknown_nmi_error (reason, regs); -#else -unknown_nmi_error (reason, regs);#endif +unknown_nmi_error (reason, regs);return ; }
kernel/sysctl.c +16 -0
@@ -733,6 +733,22 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one, }, + { + .procname = "nmi_watchdog", + .data = &watchdog_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dowatchdog_enabled, + }, +#endif +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) + { + .procname = "unknown_nmi_panic", + .data = &unknown_nmi_panic, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, #endif #if defined(CONFIG_X86) {
kernel/sysctl_binary.c +0 -1
@@ -136,7 +136,6 @@ static const struct bin_table bin_kern_table[] = { { CTL_INT, KERN_IA64_UNALIGNED, "ignore-unaligned-usertrap" }, { CTL_INT, KERN_COMPAT_LOG, "compat-log" }, { CTL_INT, KERN_MAX_LOCK_DEPTH, "max_lock_depth" }, - { CTL_INT, KERN_NMI_WATCHDOG, "nmi_watchdog" }, { CTL_INT, KERN_PANIC_ON_NMI, "panic_on_unrecovered_nmi" }, {} };
kernel/watchdog.c +2 -0
@@ -57,6 +57,8 @@ static int __init hardlockup_panic_setup(char *str) {if (!strncmp (str,"panic" ,5 )) hardlockup_panic =1 ; +else if (!strncmp (str,"0" ,1 )) + no_watchdog =1 ;return 1 ; }__setup ("nmi_watchdog=" , hardlockup_panic_setup);
Signature · 1 line
1.7.3.2
Re: [PATCH 2/2] x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
Quoted 9 lines · Don Zickus
Originally adapted from Huang Ying's patch which moved the
unknown_nmi_panicto thetraps.cfile. Because the old nmi watchdog was deleted before this change happened, theunknown_nmi_panicsysctl was lost. This re-adds it.Also, the
nmi_watchdogsysctl was re-implemented and its documentation updated accordingly.Patch-inspired-by Huang Ying <[email protected]>Signed-off-by Don Zickus <[email protected]>
(a 'thing' below which could be addressed later)
...
Quoted 7 lines
kernel/sysctl.c +0
-0@@ -733,6 +733,22 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one,
kernel/sysctl.c static struct ctl_table kern_table[] = { · line 744
Quoted 10 lines
kernel/sysctl.c +9
-0}, + { + .procname = "nmi_watchdog", + .data = &watchdog_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dowatchdog_enabled, + }, +#endif +#if defined(CONFIG_X86_LOCAL_APIC ) && defined(CONFIG_X86 )
This kinda wonders me -- do we have CONFIG_X86_LOCAL_APIC set _without_ CONFIG_X86? I mean CONFIG_X86_LOCAL_APIC is per x86, no?
Cyrill
Re: [PATCH 2/2] x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
Quoted 27 lines · Cyrill Gorcunov
Quoted 9 lines · Don Zickus
Originally adapted from Huang Ying's patch which moved the
unknown_nmi_panicto thetraps.cfile. Because the old nmi watchdog was deleted before this change happened, theunknown_nmi_panicsysctl was lost. This re-adds it.Also, the
nmi_watchdogsysctl was re-implemented and its documentation updated accordingly.Patch-inspired-by Huang Ying <[email protected]>Signed-off-by Don Zickus <[email protected]>Reviewed-by Cyrill Gorcunov <[email protected]>(a 'thing' below which could be addressed later)
...Quoted 12 lines
kernel/sysctl.c +4
-0@@ -733,6 +733,22 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one, }, + { + .procname = "nmi_watchdog", + .data = &watchdog_enabled, + .maxlen = sizeof (int),
Quoted 8 lines
kernel/sysctl.c static struct ctl_table kern_table[] = { · line 744
Quoted 5 lines
kernel/sysctl.c +5
-0+ .mode = 0644, + .proc_handler = proc_dowatchdog_enabled, + }, +#endif +#if defined(CONFIG_X86_LOCAL_APIC ) && defined(CONFIG_X86 )This kinda wonders me -- do we have
CONFIG_X86_LOCAL_APICset _without_CONFIG_X86? I meanCONFIG_X86_LOCAL_APICis per x86, no?
Probably, I was just copying-n-pasting what was there previously. I can chop it off.
Cheers,
Don
Re: [PATCH 2/2] x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
On Tue, Nov 30, 2010 at 11:20:44AM -0500, Don Zickus wrote:
...
Quoted 11 lines
Quoted 4 lines
Quoted 1 line
+#if
defined(CONFIG_X86_LOCAL_APIC)&&defined(CONFIG_X86)This kinda wonders me -- do we have
CONFIG_X86_LOCAL_APICset _without_CONFIG_X86? I meanCONFIG_X86_LOCAL_APICis per x86, no?Probably, I was just copying-n-pasting what was there previously. I can chop it off.
Cheers,
Don
ok, lets leave it as is, at least for better bisectability and tune up after.
Cyrill
Re: [PATCH 2/2] x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
In reply to Don ZickusQuoted 148 lines · Don Zickus
Originally adapted from Huang Ying's patch which moved the
unknown_nmi_panicto thetraps.cfile. Because the old nmi watchdog was deleted before this change happened, theunknown_nmi_panicsysctl was lost. This re-adds it.Also, the
nmi_watchdogsysctl was re-implemented and its documentation updated accordingly.Patch-inspired-by Huang Ying <[email protected]>Signed-off-by Don Zickus <[email protected]>--- Documentation/kernel-parameters.txt | 10 +--------- arch/x86/kernel/apic/hw_nmi.c | 3 --- arch/x86/kernel/traps.c | 16 +++++++++++----- kernel/sysctl.c | 16 ++++++++++++++++ kernel/sysctl_binary.c | 1 - kernel/watchdog.c | 2 ++ 6 files changed, 30 insertions(+), 18 deletions(-)Documentation/kernel-parameters.txt +1
-9@@ -1579,20 +1579,12 @@ and is between 256 and 4096 characters. It is defined in the file nmi_watchdog= [KNL,BUGS=X86] Debugging features for SMP kernels Format: [panic,][num] - Valid num: 0,1,2 + Valid num: 0 0 - turn nmi_watchdog off - 1 - use the IO-APIC timer for the NMI watchdog - 2 - use the local APIC for the NMI watchdog using - a performance counter. Note: This will use one - performance counter and the local APIC's performance - vector. When panic is specified, panic when an NMI watchdog timeout occurs. This is useful when you use a panic=... timeout and need the box quickly up again. - Instead of 1 and 2 it is possible to use the following - symbolic names: lapic and ioapic - Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic netpoll.carrier_timeout= [NET] Specifies amount of time (in seconds) thatarch/x86/kernel/apic/hw_nmi.c +0
-3@@ -100,6 +100,3 @@ static int __init register_trigger_all_cpu_backtrace(void) }early_initcall (register_trigger_all_cpu_backtrace);#endif - -/* STUB calls to mimic old nmi_watchdog behaviour */ -int unknown_nmi_panic;arch/x86/kernel/traps.c +11
-5@@ -83,6 +83,8 @@ EXPORT_SYMBOL_GPL(used_vectors);static int ignore_nmis; +int unknown_nmi_panic; +static inline void conditional_sti (struct pt_regs *regs) {if (regs->flags &X86_EFLAGS_IF )@@ -300,6 +302,13 @@ gp_in_kernel:die ("general protection fault" , regs, error_code); } +static int __init setup_unknown_nmi_panic (char *str) +{ + unknown_nmi_panic =1 ; +return 1 ; +} +__setup ("unknown_nmi_panic" , setup_unknown_nmi_panic); + static notrace __kprobes voidmem_parity_error (unsigned char reason,struct pt_regs *regs) {@@ -371,7 +380,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) reason, smp_processor_id());printk (KERN_EMERG "Do you have a strange power saving mode enabled?\n" ); -if (panic_on_unrecovered_nmi) +if (unknown_nmi_panic || panic_on_unrecovered_nmi)panic ("NMI: Not continuing" );printk (KERN_EMERG "Dazed and confused, but trying to continue\n" );@@ -397,11 +406,8 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)if (notify_die (DIE_NMI ,"nmi" , regs, reason,2 ,SIGINT ) ==NOTIFY_STOP )return ; - -unknown_nmi_error (reason, regs); -#else -unknown_nmi_error (reason, regs);#endif +unknown_nmi_error (reason, regs);return ; }kernel/sysctl.c +16
-0@@ -733,6 +733,22 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one, }, + { + .procname = "nmi_watchdog", + .data = &watchdog_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dowatchdog_enabled, + }, +#endif +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) + { + .procname = "unknown_nmi_panic", + .data = &unknown_nmi_panic, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, #endif #if defined(CONFIG_X86) {kernel/sysctl_binary.c +0
-1@@ -136,7 +136,6 @@ static const struct bin_table bin_kern_table[] = { { CTL_INT, KERN_IA64_UNALIGNED, "ignore-unaligned-usertrap" }, { CTL_INT, KERN_COMPAT_LOG, "compat-log" }, { CTL_INT, KERN_MAX_LOCK_DEPTH, "max_lock_depth" }, - { CTL_INT, KERN_NMI_WATCHDOG, "nmi_watchdog" }, { CTL_INT, KERN_PANIC_ON_NMI, "panic_on_unrecovered_nmi" }, {} };kernel/watchdog.c +0
-0
kernel/watchdog.c static int __init hardlockup_panic_setup(char *str) · line 64
Quoted 8 lines
kernel/watchdog.c +2
-0@@ -57,6 +57,8 @@ static int __init hardlockup_panic_setup(char *str) {if (!strncmp (str,"panic" ,5 )) hardlockup_panic =1 ; +else if (!strncmp (str,"0" ,1 )) + no_watchdog =1 ;return 1 ; }__setup ("nmi_watchdog=" , hardlockup_panic_setup);
Thanks, unknown_nmi_panic works again.
[tip:perf/core] x86, NMI: Add back unknown_nmi_panic and nmi_watchdog sysctls
In reply to Don ZickusCommit-ID: 5dc3055879b8f659f62abb7c3d1eaa4d02e36d65 Gitweb: http://git.kernel.org/tip/5dc3055879b8f659f62abb7c3d1eaa4d02e36d65 Author: Don Zickus <[email protected]> AuthorDate: Mon, 29 Nov 2010 17:07:17 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 10 Dec 2010 00:01:06 +0100
x86, NMI: Add back unknown_nmi_panic and nmi_watchdog sysctls
Originally adapted from Huang Ying's patch which moved the unknown_nmi_panic to the traps.c file. Because the old nmi watchdog was deleted before this change happened, the unknown_nmi_panic sysctl was lost. This re-adds it.
Also, the nmi_watchdog sysctl was re-implemented and its documentation updated accordingly.
LKML-Reference: <[email protected]>
--- Documentation/kernel-parameters.txt | 10 +--------- arch/x86/kernel/apic/hw_nmi.c | 3 --- arch/x86/kernel/traps.c | 16 +++++++++++----- kernel/sysctl.c | 16 ++++++++++++++++ kernel/sysctl_binary.c | 1 - kernel/watchdog.c | 2 ++ 6 files changed, 30 insertions(+), 18 deletions(-)
Documentation/kernel-parameters.txt +1 -9
@@ -1579,20 +1579,12 @@ and is between 256 and 4096 characters. It is defined in the file nmi_watchdog= [KNL,BUGS=X86] Debugging features for SMP kernels Format: [panic,][num] - Valid num: 0,1,2 + Valid num: 0 0 - turn nmi_watchdog off - 1 - use the IO-APIC timer for the NMI watchdog - 2 - use the local APIC for the NMI watchdog using - a performance counter. Note: This will use one - performance counter and the local APIC's performance - vector. When panic is specified, panic when an NMI watchdog timeout occurs. This is useful when you use a panic=... timeout and need the box quickly up again. - Instead of 1 and 2 it is possible to use the following - symbolic names: lapic and ioapic - Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic netpoll.carrier_timeout= [NET] Specifies amount of time (in seconds) that
arch/x86/kernel/apic/hw_nmi.c +0 -3
@@ -99,6 +99,3 @@ static int __init register_trigger_all_cpu_backtrace(void) }early_initcall (register_trigger_all_cpu_backtrace);#endif - -/* STUB calls to mimic old nmi_watchdog behaviour */ -int unknown_nmi_panic;
arch/x86/kernel/traps.c +11 -5
@@ -83,6 +83,8 @@ EXPORT_SYMBOL_GPL(used_vectors);static int ignore_nmis; +int unknown_nmi_panic; +static inline void conditional_sti (struct pt_regs *regs) {if (regs->flags &X86_EFLAGS_IF )
@@ -300,6 +302,13 @@ gp_in_kernel:die ("general protection fault" , regs, error_code); } +static int __init setup_unknown_nmi_panic (char *str) +{ + unknown_nmi_panic =1 ; +return 1 ; +} +__setup ("unknown_nmi_panic" , setup_unknown_nmi_panic); + static notrace __kprobes voidmem_parity_error (unsigned char reason,struct pt_regs *regs) {
@@ -371,7 +380,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) reason, smp_processor_id());printk (KERN_EMERG "Do you have a strange power saving mode enabled?\n" ); -if (panic_on_unrecovered_nmi) +if (unknown_nmi_panic || panic_on_unrecovered_nmi)panic ("NMI: Not continuing" );printk (KERN_EMERG "Dazed and confused, but trying to continue\n" );
@@ -397,11 +406,8 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)if (notify_die (DIE_NMI ,"nmi" , regs, reason,2 ,SIGINT ) ==NOTIFY_STOP )return ; - -unknown_nmi_error (reason, regs); -#else -unknown_nmi_error (reason, regs);#endif +unknown_nmi_error (reason, regs);return ; }
kernel/sysctl.c +16 -0
@@ -745,6 +745,22 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, .extra2 = &one, }, + { + .procname = "nmi_watchdog", + .data = &watchdog_enabled, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dowatchdog_enabled, + }, +#endif +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) + { + .procname = "unknown_nmi_panic", + .data = &unknown_nmi_panic, + .maxlen = sizeof (int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, #endif #if defined(CONFIG_X86) {
kernel/sysctl_binary.c +0 -1
@@ -136,7 +136,6 @@ static const struct bin_table bin_kern_table[] = { { CTL_INT, KERN_IA64_UNALIGNED, "ignore-unaligned-usertrap" }, { CTL_INT, KERN_COMPAT_LOG, "compat-log" }, { CTL_INT, KERN_MAX_LOCK_DEPTH, "max_lock_depth" }, - { CTL_INT, KERN_NMI_WATCHDOG, "nmi_watchdog" }, { CTL_INT, KERN_PANIC_ON_NMI, "panic_on_unrecovered_nmi" }, {} };
kernel/watchdog.c +2 -0
@@ -57,6 +57,8 @@ static int __init hardlockup_panic_setup(char *str) {if (!strncmp (str,"panic" ,5 )) hardlockup_panic =1 ; +else if (!strncmp (str,"0" ,1 )) + no_watchdog =1 ;return 1 ; }__setup ("nmi_watchdog=" , hardlockup_panic_setup);