archive mirror
 help / color / mirror / Atom feed
From: Alexey Dobriyan <>
To: Andrew Morton <>
Subject: [PATCH] Don't trigger full rebuild via CONFIG_X86_MCE
Date: Mon, 8 May 2006 23:45:43 +0400	[thread overview]
Message-ID: <> (raw)

Signed-off-by: Alexey Dobriyan <>

 To be applied on top of already sent CONFIG_MTRR patch.

--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -10,10 +10,11 @@
 #include <asm/i387.h>
 #include <asm/msr.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
 #include <asm/mtrr.h>
+#include <asm/mce.h>
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <mach_apic.h>
--- a/arch/i386/power/cpu.c
+++ b/arch/i386/power/cpu.c
@@ -9,10 +9,11 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/suspend.h>
 #include <asm/mtrr.h>
+#include <asm/mce.h>
 static struct saved_context saved_context;
 unsigned long saved_context_ebx;
 unsigned long saved_context_esp, saved_context_ebp;
--- /dev/null
+++ b/include/asm-i386/mce.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_MCE
+extern void mcheck_init(struct cpuinfo_x86 *c);
+#define mcheck_init(c) do {} while(0)
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -727,12 +727,6 @@ extern void select_idle_routine(const st
 extern unsigned long boot_option_idle_override;
 extern void enable_sep_cpu(void);
 extern int sysenter_setup(void);
-#ifdef CONFIG_X86_MCE
-extern void mcheck_init(struct cpuinfo_x86 *c);
-#define mcheck_init(c) do {} while(0)
 #endif /* __ASM_I386_PROCESSOR_H */

                 reply	other threads:[~2006-05-08 19:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \
    --subject='Re: [PATCH] Don'\''t trigger full rebuild via CONFIG_X86_MCE' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox