Commit 50e440aa authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar

x86: call nmi_watchdog_default in i386

this does not exist, so it will be an empty macro
Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4626df18
...@@ -876,6 +876,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -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 */ who understands all this stuff should rewrite it properly. --RR 15/Jul/02 */
void __init native_smp_prepare_cpus(unsigned int max_cpus) void __init native_smp_prepare_cpus(unsigned int max_cpus)
{ {
nmi_watchdog_default();
smp_commenced_mask = cpumask_of_cpu(0); smp_commenced_mask = cpumask_of_cpu(0);
cpu_callin_map = cpumask_of_cpu(0); cpu_callin_map = cpumask_of_cpu(0);
mb(); mb();
......
...@@ -39,6 +39,9 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev) ...@@ -39,6 +39,9 @@ static inline void unset_nmi_pm_callback(struct pm_dev *dev)
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
extern void default_do_nmi(struct pt_regs *); extern void default_do_nmi(struct pt_regs *);
extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); 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 #endif
extern int check_nmi_watchdog(void); extern int check_nmi_watchdog(void);
...@@ -50,7 +53,6 @@ extern int reserve_perfctr_nmi(unsigned int); ...@@ -50,7 +53,6 @@ extern int reserve_perfctr_nmi(unsigned int);
extern void release_perfctr_nmi(unsigned int); extern void release_perfctr_nmi(unsigned int);
extern int reserve_evntsel_nmi(unsigned int); extern int reserve_evntsel_nmi(unsigned int);
extern void release_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 setup_apic_nmi_watchdog(void *);
extern void stop_apic_nmi_watchdog(void *); extern void stop_apic_nmi_watchdog(void *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment