diff options
Diffstat (limited to 'include/asm-x86/mtrr.h')
-rw-r--r-- | include/asm-x86/mtrr.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/asm-x86/mtrr.h b/include/asm-x86/mtrr.h index e8320e4e6ca2..319d065800be 100644 --- a/include/asm-x86/mtrr.h +++ b/include/asm-x86/mtrr.h | |||
@@ -89,24 +89,25 @@ struct mtrr_gentry | |||
89 | extern void mtrr_save_fixed_ranges(void *); | 89 | extern void mtrr_save_fixed_ranges(void *); |
90 | extern void mtrr_save_state(void); | 90 | extern void mtrr_save_state(void); |
91 | extern int mtrr_add (unsigned long base, unsigned long size, | 91 | extern int mtrr_add (unsigned long base, unsigned long size, |
92 | unsigned int type, char increment); | 92 | unsigned int type, bool increment); |
93 | extern int mtrr_add_page (unsigned long base, unsigned long size, | 93 | extern int mtrr_add_page (unsigned long base, unsigned long size, |
94 | unsigned int type, char increment); | 94 | unsigned int type, bool increment); |
95 | extern int mtrr_del (int reg, unsigned long base, unsigned long size); | 95 | extern int mtrr_del (int reg, unsigned long base, unsigned long size); |
96 | extern int mtrr_del_page (int reg, unsigned long base, unsigned long size); | 96 | extern int mtrr_del_page (int reg, unsigned long base, unsigned long size); |
97 | extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi); | 97 | extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi); |
98 | extern void mtrr_ap_init(void); | 98 | extern void mtrr_ap_init(void); |
99 | extern void mtrr_bp_init(void); | 99 | extern void mtrr_bp_init(void); |
100 | extern int mtrr_trim_uncached_memory(unsigned long end_pfn); | ||
100 | # else | 101 | # else |
101 | #define mtrr_save_fixed_ranges(arg) do {} while (0) | 102 | #define mtrr_save_fixed_ranges(arg) do {} while (0) |
102 | #define mtrr_save_state() do {} while (0) | 103 | #define mtrr_save_state() do {} while (0) |
103 | static __inline__ int mtrr_add (unsigned long base, unsigned long size, | 104 | static __inline__ int mtrr_add (unsigned long base, unsigned long size, |
104 | unsigned int type, char increment) | 105 | unsigned int type, bool increment) |
105 | { | 106 | { |
106 | return -ENODEV; | 107 | return -ENODEV; |
107 | } | 108 | } |
108 | static __inline__ int mtrr_add_page (unsigned long base, unsigned long size, | 109 | static __inline__ int mtrr_add_page (unsigned long base, unsigned long size, |
109 | unsigned int type, char increment) | 110 | unsigned int type, bool increment) |
110 | { | 111 | { |
111 | return -ENODEV; | 112 | return -ENODEV; |
112 | } | 113 | } |
@@ -120,7 +121,10 @@ static __inline__ int mtrr_del_page (int reg, unsigned long base, | |||
120 | { | 121 | { |
121 | return -ENODEV; | 122 | return -ENODEV; |
122 | } | 123 | } |
123 | 124 | static inline int mtrr_trim_uncached_memory(unsigned long end_pfn) | |
125 | { | ||
126 | return 0; | ||
127 | } | ||
124 | static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;} | 128 | static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;} |
125 | 129 | ||
126 | #define mtrr_ap_init() do {} while (0) | 130 | #define mtrr_ap_init() do {} while (0) |