Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a03a3e287b119c7bcbcff1d68f81864ce33b1ad2

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent b88d4f1d39
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

[PATCH] Don't trigger full rebuild via CONFIG_X86_MCE 

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 4 changed files with 7 additions and 6 deletions Side-by-side Diff

arch/i386/kernel/cpu/common.c
Diff comments   View file @ a03a3e2
... ... @@ -12,6 +12,7 @@
12 12 #include <asm/io.h>
13 13 #include <asm/mmu_context.h>
14 14 #include <asm/mtrr.h>
  15 +#include <asm/mce.h>
15 16 #ifdef CONFIG_X86_LOCAL_APIC
16 17 #include <asm/mpspec.h>
17 18 #include <asm/apic.h>
arch/i386/power/cpu.c
Diff comments   View file @ a03a3e2
... ... @@ -11,6 +11,7 @@
11 11 #include <linux/module.h>
12 12 #include <linux/suspend.h>
13 13 #include <asm/mtrr.h>
  14 +#include <asm/mce.h>
14 15  
15 16 static struct saved_context saved_context;
16 17  
include/asm-i386/mce.h
Diff comments   View file @ a03a3e2
  1 +#ifdef CONFIG_X86_MCE
  2 +extern void mcheck_init(struct cpuinfo_x86 *c);
  3 +#else
  4 +#define mcheck_init(c) do {} while(0)
  5 +#endif
include/asm-i386/processor.h
Diff comments   View file @ a03a3e2
... ... @@ -728,11 +728,5 @@
728 728 extern void enable_sep_cpu(void);
729 729 extern int sysenter_setup(void);
730 730  
731   -#ifdef CONFIG_X86_MCE
732   -extern void mcheck_init(struct cpuinfo_x86 *c);
733   -#else
734   -#define mcheck_init(c) do {} while(0)
735   -#endif
736   -
737 731 #endif /* __ASM_I386_PROCESSOR_H */