Re: [PATCH 2/2] x86, NMI: add back unknown_nmi_panic andnmi_watchdog sysctls

[Don Zickus]

On Tue, Nov 30, 2010 at 04:15:17PM +0300, Cyrill Gorcunov wrote:
> On Mon, Nov 29, 2010 at 05:07:17PM -0500, Don Zickus wrote:
> > 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.
> > 
> > Patch-inspired-by: Huang Ying <ying.huang@xxxxxxxxx>
> > Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
> 
> Reviewed-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
> 
> (a 'thing' below which could be addressed later)
> ...
> > diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> > index d91b07d..140344d 100644
> > --- a/kernel/sysctl.c
> > +++ b/kernel/sysctl.c
> > @@ -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)
> 
> 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?

Probably, I was just copying-n-pasting what was there previously.  I can
chop it off.

Cheers,
Don
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/