aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-06-23 05:04:20 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:42:56 -0400
commita03a3e287b119c7bcbcff1d68f81864ce33b1ad2 (patch)
tree9a95f05e533835a57b56645190b60cdd16f134e2 /arch
parentb88d4f1d390a6a232938d27d551f24cf08a2c7e0 (diff)
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/cpu/common.c1
-rw-r--r--arch/i386/power/cpu.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index f2a2b0ac9a18..44f2c5f2dda1 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -12,6 +12,7 @@
12#include <asm/io.h> 12#include <asm/io.h>
13#include <asm/mmu_context.h> 13#include <asm/mmu_context.h>
14#include <asm/mtrr.h> 14#include <asm/mtrr.h>
15#include <asm/mce.h>
15#ifdef CONFIG_X86_LOCAL_APIC 16#ifdef CONFIG_X86_LOCAL_APIC
16#include <asm/mpspec.h> 17#include <asm/mpspec.h>
17#include <asm/apic.h> 18#include <asm/apic.h>
diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c
index 63d25ca6306f..e6517915fe3e 100644
--- a/arch/i386/power/cpu.c
+++ b/arch/i386/power/cpu.c
@@ -11,6 +11,7 @@
11#include <linux/module.h> 11#include <linux/module.h>
12#include <linux/suspend.h> 12#include <linux/suspend.h>
13#include <asm/mtrr.h> 13#include <asm/mtrr.h>
14#include <asm/mce.h>
14 15
15static struct saved_context saved_context; 16static struct saved_context saved_context;
16 17