lkml.org 
[lkml]   [2010]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] x86, NMI: add back unknown_nmi_panic and nmi_watchdog sysctls
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@intel.com>
> Signed-off-by: Don Zickus <dzickus@redhat.com>

Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>

(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?

Cyrill


\
 
 \ /
  Last update: 2010-11-30 14:17    [W:0.062 / U:29.852 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site