Commit 29cbc78b authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86: Clean up x86 NMI sysctls 



Use prototypes in headers
Don't define panic_on_unrecovered_nmi for all architectures

Cc: dzickus@redhat.com

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 013bf2c5

arch/i386/kernel/nmi.c

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 


#include "mach_traps.h"



int unknown_nmi_panic;

int nmi_watchdog_enabled;



/* perfctr_nmi_owner tracks the ownership of the perfctr registers:

 * evtsel_nmi_owner tracks the ownership of the event selection

 * - different performance counters/ event selection may be reserved for

arch/i386/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 


#include "mach_traps.h"



int panic_on_unrecovered_nmi;



asmlinkage int system_call(void);



struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },

arch/x86_64/kernel/nmi.c

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 
#include <asm/mce.h>

#include <asm/intel_arch_perfmon.h>



int unknown_nmi_panic;

int nmi_watchdog_enabled;

int panic_on_unrecovered_nmi;



/* perfctr_nmi_owner tracks the ownership of the perfctr registers:

 * evtsel_nmi_owner tracks the ownership of the event selection

 * - different performance counters/ event selection may be reserved for

include/asm-i386/nmi.h

+6 −0
Original line number Diff line number Diff line
@@ -36,4 +36,10 @@ extern unsigned int nmi_watchdog; 
#define NMI_LOCAL_APIC	2

#define NMI_INVALID	3



struct ctl_table;

struct file;

extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,

			void __user *, size_t *, loff_t *);

extern int unknown_nmi_panic;



#endif /* ASM_NMI_H */

include/asm-x86_64/nmi.h

+7 −0
Original line number Diff line number Diff line
@@ -70,4 +70,11 @@ extern unsigned int nmi_watchdog; 
#define NMI_LOCAL_APIC	2

#define NMI_INVALID	3



struct ctl_table;

struct file;

extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,

			void __user *, size_t *, loff_t *);



extern int unknown_nmi_panic;



#endif /* ASM_NMI_H */