Commit 4b82b277 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Thomas Gleixner
Browse files

x86: nmi_32.c - add nmi_watchdog_default helper 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Cc: hpa@zytor.com
Cc: mingo@redhat.com
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d1b946b9

arch/x86/kernel/nmi_32.c

+13 −6
Original line number Diff line number Diff line
@@ -51,6 +51,17 @@ static DEFINE_PER_CPU(short, wd_enabled); 


static int endflag __initdata = 0;



/* Run after command line and cpu_init init, but before all other checks */

void nmi_watchdog_default(void)

{

	if (nmi_watchdog != NMI_DEFAULT)

		return;

	if (lapic_watchdog_ok())

		nmi_watchdog = NMI_LOCAL_APIC;

	else

		nmi_watchdog = NMI_IO_APIC;

}



#ifdef CONFIG_SMP

/* The performance counters used by NMI_LOCAL_APIC don't trigger when

 * the CPU is idle. To make sure the NMI watchdog really ticks on all
@@ -437,12 +448,8 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, 
		return -EIO;

	}



	if (nmi_watchdog == NMI_DEFAULT) {

		if (lapic_watchdog_ok())

			nmi_watchdog = NMI_LOCAL_APIC;

		else

			nmi_watchdog = NMI_IO_APIC;

	}

	/* if nmi_watchdog is not set yet, then set it */

	nmi_watchdog_default();



	if (nmi_watchdog == NMI_LOCAL_APIC) {

		if (nmi_watchdog_enabled)

include/asm-x86/nmi.h

+1 −3
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev) 


#ifdef CONFIG_X86_64

extern void default_do_nmi(struct pt_regs *);

extern void nmi_watchdog_default(void);

#else

#define nmi_watchdog_default() do {} while (0)

#endif



extern void nmi_watchdog_default(void);

extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);

extern int check_nmi_watchdog(void);

extern int nmi_watchdog_enabled;