Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 50e440aa5323860d9e5960143b720e461ed0c582

Authored by Glauber de Oliveira Costa
Committed by Ingo Molnar
1 parent 4626df1801
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 4 additions and 1 deletions Side-by-side Diff

arch/x86/kernel/smpboot_32.c
Diff comments   View file @ 50e440a
... ... @@ -876,6 +876,7 @@
876 876 who understands all this stuff should rewrite it properly. --RR 15/Jul/02 */
877 877 void __init native_smp_prepare_cpus(unsigned int max_cpus)
878 878 {
  879 + nmi_watchdog_default();
879 880 smp_commenced_mask = cpumask_of_cpu(0);
880 881 cpu_callin_map = cpumask_of_cpu(0);
881 882 mb();
include/asm-x86/nmi.h
Diff comments   View file @ 50e440a
... ... @@ -39,6 +39,9 @@
39 39 #ifdef CONFIG_X86_64
40 40 extern void default_do_nmi(struct pt_regs *);
41 41 extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
  42 +extern void nmi_watchdog_default(void);
  43 +#else
  44 +#define nmi_watchdog_default() do {} while (0)
42 45 #endif
43 46  
44 47 extern int check_nmi_watchdog(void);
... ... @@ -50,7 +53,6 @@
50 53 extern void release_perfctr_nmi(unsigned int);
51 54 extern int reserve_evntsel_nmi(unsigned int);
52 55 extern void release_evntsel_nmi(unsigned int);
53   -extern void nmi_watchdog_default(void);
54 56  
55 57 extern void setup_apic_nmi_watchdog(void *);
56 58 extern void stop_apic_nmi_watchdog(void *);