The patch titled
Don't trigger full rebuild via CONFIG_MTRR
has been removed from the -mm tree. Its filename is
x86-dont-trigger-full-rebuild-via-config_mtrr.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Don't trigger full rebuild via CONFIG_MTRR
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Only drm, framebuffer, mtrr parts + misc files here and there.
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/mtrr.h | 4 ++++
include/asm-i386/processor.h | 8 --------
4 files changed, 6 insertions(+), 8 deletions(-)
diff -puN arch/i386/kernel/cpu/common.c~x86-dont-trigger-full-rebuild-via-config_mtrr arch/i386/kernel/cpu/common.c
--- a/arch/i386/kernel/cpu/common.c~x86-dont-trigger-full-rebuild-via-config_mtrr
+++ a/arch/i386/kernel/cpu/common.c
@@ -11,6 +11,7 @@
#include <asm/msr.h>
#include <asm/io.h>
#include <asm/mmu_context.h>
+#include <asm/mtrr.h>
#ifdef CONFIG_X86_LOCAL_APIC
#include <asm/mpspec.h>
#include <asm/apic.h>
diff -puN arch/i386/power/cpu.c~x86-dont-trigger-full-rebuild-via-config_mtrr arch/i386/power/cpu.c
--- a/arch/i386/power/cpu.c~x86-dont-trigger-full-rebuild-via-config_mtrr
+++ a/arch/i386/power/cpu.c
@@ -10,6 +10,7 @@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/suspend.h>
+#include <asm/mtrr.h>
static struct saved_context saved_context;
diff -puN include/asm-i386/mtrr.h~x86-dont-trigger-full-rebuild-via-config_mtrr include/asm-i386/mtrr.h
--- a/include/asm-i386/mtrr.h~x86-dont-trigger-full-rebuild-via-config_mtrr
+++ a/include/asm-i386/mtrr.h
@@ -76,6 +76,8 @@ extern int mtrr_add_page (unsigned long
extern int mtrr_del (int reg, unsigned long base, unsigned long size);
extern int mtrr_del_page (int reg, unsigned long base, unsigned long size);
extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
+extern void mtrr_ap_init(void);
+extern void mtrr_bp_init(void);
# else
static __inline__ int mtrr_add (unsigned long base, unsigned long size,
unsigned int type, char increment)
@@ -100,6 +102,8 @@ static __inline__ int mtrr_del_page (int
static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;}
+#define mtrr_ap_init() do {} while (0)
+#define mtrr_bp_init() do {} while (0)
# endif
#endif
diff -puN include/asm-i386/processor.h~x86-dont-trigger-full-rebuild-via-config_mtrr include/asm-i386/processor.h
--- a/include/asm-i386/processor.h~x86-dont-trigger-full-rebuild-via-config_mtrr
+++ a/include/asm-i386/processor.h
@@ -728,14 +728,6 @@ extern unsigned long boot_option_idle_ov
extern void enable_sep_cpu(void);
extern int sysenter_setup(void);
-#ifdef CONFIG_MTRR
-extern void mtrr_ap_init(void);
-extern void mtrr_bp_init(void);
-#else
-#define mtrr_ap_init() do {} while (0)
-#define mtrr_bp_init() do {} while (0)
-#endif
-
#ifdef CONFIG_X86_MCE
extern void mcheck_init(struct cpuinfo_x86 *c);
#else
_
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
