The patch titled
Don't trigger full rebuild via CONFIG_X86_MCE
has been added to the -mm tree. Its filename is
dont-trigger-full-rebuild-via-config_x86_mce.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/cpu/common.c | 1 +
arch/i386/power/cpu.c | 1 +
include/asm-i386/mce.h | 5 +++++
include/asm-i386/processor.h | 6 ------
4 files changed, 7 insertions(+), 6 deletions(-)
diff -puN arch/i386/kernel/cpu/common.c~dont-trigger-full-rebuild-via-config_x86_mce arch/i386/kernel/cpu/common.c
--- devel/arch/i386/kernel/cpu/common.c~dont-trigger-full-rebuild-via-config_x86_mce 2006-05-10 23:32:17.000000000 -0700
+++ devel-akpm/arch/i386/kernel/cpu/common.c 2006-05-10 23:32:17.000000000 -0700
@@ -12,6 +12,7 @@
#include <asm/io.h>
#include <asm/mmu_context.h>
#include <asm/mtrr.h>
+#include <asm/mce.h>
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/mpspec.h>
#include <asm/apic.h>
diff -puN arch/i386/power/cpu.c~dont-trigger-full-rebuild-via-config_x86_mce arch/i386/power/cpu.c
--- devel/arch/i386/power/cpu.c~dont-trigger-full-rebuild-via-config_x86_mce 2006-05-10 23:32:17.000000000 -0700
+++ devel-akpm/arch/i386/power/cpu.c 2006-05-10 23:32:17.000000000 -0700
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/suspend.h>
#include <asm/mtrr.h>
+#include <asm/mce.h>
static struct saved_context saved_context;
diff -puN /dev/null include/asm-i386/mce.h
--- /dev/null 2003-09-15 06:40:47.000000000 -0700
+++ devel-akpm/include/asm-i386/mce.h 2006-05-10 23:32:17.000000000 -0700
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_MCE
+extern void mcheck_init(struct cpuinfo_x86 *c);
+#else
+#define mcheck_init(c) do {} while(0)
+#endif
diff -puN include/asm-i386/processor.h~dont-trigger-full-rebuild-via-config_x86_mce include/asm-i386/processor.h
--- devel/include/asm-i386/processor.h~dont-trigger-full-rebuild-via-config_x86_mce 2006-05-10 23:32:17.000000000 -0700
+++ devel-akpm/include/asm-i386/processor.h 2006-05-10 23:32:17.000000000 -0700
@@ -730,10 +730,4 @@ extern unsigned long boot_option_idle_ov
extern void enable_sep_cpu(void);
extern int sysenter_setup(void);
-#ifdef CONFIG_X86_MCE
-extern void mcheck_init(struct cpuinfo_x86 *c);
-#else
-#define mcheck_init(c) do {} while(0)
-#endif
-
#endif /* __ASM_I386_PROCESSOR_H */
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
git-acpi.patch
x86-dont-trigger-full-rebuild-via-config_mtrr.patch
dont-trigger-full-rebuild-via-config_x86_mce.patch
remove-fs-jffs2-histoh.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
two-additions-to-linux-documentation-ioctl-numbertxt.patch
more-bug_on-conversion.patch
reiser4.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
