aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-x86/mtrr.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-x86/mtrr.h b/include/asm-x86/mtrr.h
index 968794af93f9..ee172296e056 100644
--- a/include/asm-x86/mtrr.h
+++ b/include/asm-x86/mtrr.h
@@ -84,10 +84,9 @@ struct mtrr_gentry
84 84
85#ifdef __KERNEL__ 85#ifdef __KERNEL__
86 86
87extern u8 mtrr_type_lookup(u64 addr, u64 end);
88
89/* The following functions are for use by other drivers */ 87/* The following functions are for use by other drivers */
90# ifdef CONFIG_MTRR 88# ifdef CONFIG_MTRR
89extern u8 mtrr_type_lookup(u64 addr, u64 end);
91extern void mtrr_save_fixed_ranges(void *); 90extern void mtrr_save_fixed_ranges(void *);
92extern void mtrr_save_state(void); 91extern void mtrr_save_state(void);
93extern int mtrr_add (unsigned long base, unsigned long size, 92extern int mtrr_add (unsigned long base, unsigned long size,
@@ -101,6 +100,13 @@ extern void mtrr_ap_init(void);
101extern void mtrr_bp_init(void); 100extern void mtrr_bp_init(void);
102extern int mtrr_trim_uncached_memory(unsigned long end_pfn); 101extern int mtrr_trim_uncached_memory(unsigned long end_pfn);
103# else 102# else
103static inline u8 mtrr_type_lookup(u64 addr, u64 end)
104{
105 /*
106 * Return no-MTRRs:
107 */
108 return 0xff;
109}
104#define mtrr_save_fixed_ranges(arg) do {} while (0) 110#define mtrr_save_fixed_ranges(arg) do {} while (0)
105#define mtrr_save_state() do {} while (0) 111#define mtrr_save_state() do {} while (0)
106static __inline__ int mtrr_add (unsigned long base, unsigned long size, 112static __inline__ int mtrr_add (unsigned long base, unsigned long size,