Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b07da7 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] Don't trigger full rebuild via CONFIG_MTRR 



Only drm, framebuffer, mtrr parts + misc files here and there.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87af2ffd

arch/i386/kernel/cpu/common.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/i386/power/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

include/asm-i386/mtrr.h

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ extern int mtrr_add_page (unsigned long base, unsigned long size, 
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 reg, unsigned long base, 


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

include/asm-i386/processor.h

+0 −8
Original line number Diff line number Diff line
@@ -728,14 +728,6 @@ extern unsigned long boot_option_idle_override; 
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