Re: [tip:perf/core] x86, nmi_watchdog: Remove the old nmi_watchdog

[Yinghai Lu <yinghai@kernel.org>]

On 11/18/2010 11:11 AM, Yinghai Lu wrote:
> On 11/18/2010 06:05 AM, tip-bot for Don Zickus wrote:

>>   * Create trigger_all_cpu_backtrace() out of the arch-provided
>> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
>> index b65bf63..ce33e2a 100644
>> --- a/kernel/sysctl.c
>> +++ b/kernel/sysctl.c
>> @@ -746,22 +746,6 @@ static struct ctl_table kern_table[] = {
>>  		.extra2		= &one,
>>  	},
>>  #endif
>> -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) && !defined(CONFIG_LOCKUP_DETECTOR)
>> -	{
>> -		.procname       = "unknown_nmi_panic",
>> -		.data           = &unknown_nmi_panic,
>> -		.maxlen         = sizeof (int),
>> -		.mode           = 0644,
>> -		.proc_handler   = proc_dointvec,
>> -	},
>> -	{
>> -		.procname       = "nmi_watchdog",
>> -		.data           = &nmi_watchdog_enabled,
>> -		.maxlen         = sizeof (int),
>> -		.mode           = 0644,
>> -		.proc_handler   = proc_nmi_enabled,
>> -	},
>> -#endif
> 
> Please update the kernel-parameters.txt accordingly.
> 
> and you need to keep unknown_nmi_panic or else as early_param().
> 
> Also any corresponding part like "nmi_watchdog=off" ?
> 

also you have some other left-over...

Documentation/kernel-parameters.txt:    unknown_nmi_panic
Documentation/kernel-parameters.txt:                    Set unknown_nmi_panic=1 early on boot.
Documentation/sysctl/kernel.txt:- unknown_nmi_panic
Documentation/sysctl/kernel.txt:unknown_nmi_panic:
arch/x86/include/asm/nmi.h:extern int unknown_nmi_panic;
arch/x86/kernel/apic/hw_nmi.c:int unknown_nmi_panic;
kernel/sysctl_binary.c: { CTL_INT,      KERN_UNKNOWN_NMI_PANIC,         "unknown_nmi_panic" },

may still have left for nmi_watchdog too.

Yinghai