The patch titled
Don't trigger full rebuild via CONFIG_X86_MCE
has been removed from the -mm tree. Its filename is
dont-trigger-full-rebuild-via-config_x86_mce.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Don't trigger full rebuild via CONFIG_X86_MCE
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
--- a/arch/i386/kernel/cpu/common.c~dont-trigger-full-rebuild-via-config_x86_mce
+++ a/arch/i386/kernel/cpu/common.c
@@ -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
--- a/arch/i386/power/cpu.c~dont-trigger-full-rebuild-via-config_x86_mce
+++ a/arch/i386/power/cpu.c
@@ -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
+++ a/include/asm-i386/mce.h
@@ -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
--- a/include/asm-i386/processor.h~dont-trigger-full-rebuild-via-config_x86_mce
+++ a/include/asm-i386/processor.h
@@ -728,10 +728,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
origin.patch
nfs-remove-nfs_put_link.patch
git-xfs.patch
xfs-pass-inode-to-xfs_ioc_space.patch
emu10k1-mark-midi_spinlock-as-used.patch
nbd-endian-annotations.patch
reiserfs-remove-reiserfs_aio_write.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
