Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50e440aa authored Mar 19, 2008 by Glauber de Oliveira Costa Committed by Ingo Molnar Apr 17, 2008

x86: call nmi_watchdog_default in i386



this does not exist, so it will be an empty macro

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 4626df18

arch/x86/kernel/smpboot_32.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -876,6 +876,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
		who understands all this stuff should rewrite it properly. --RR 15/Jul/02 */
		void __init native_smp_prepare_cpus(unsigned int max_cpus)
		{
		nmi_watchdog_default();
		smp_commenced_mask = cpumask_of_cpu(0);
		cpu_callin_map = cpumask_of_cpu(0);
		mb();

include/asm-x86/nmi.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,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 die_nmi(char str, struct pt_regs regs, int do_panic);
		extern void nmi_watchdog_default(void);
		#else
		#define nmi_watchdog_default() do {} while (0)
		#endif

		extern int check_nmi_watchdog(void);
		@@ -50,7 +53,6 @@ extern int reserve_perfctr_nmi(unsigned int);
		extern void release_perfctr_nmi(unsigned int);
		extern int reserve_evntsel_nmi(unsigned int);
		extern void release_evntsel_nmi(unsigned int);
		extern void nmi_watchdog_default(void);

		extern void setup_apic_nmi_watchdog(void *);
		extern void stop_apic_nmi_watchdog(void *);