aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-05-02 13:27:17 -0400
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 13:27:17 -0400
commit856f44ff4af6e57fdc39a8b2bec498c88438bd27 (patch)
tree475ca01f27c3272ec9e3d15f3d8209ad4424c3bc /include/asm-x86_64
parent03df4f6ee997589a84d5f9492c6419183724c710 (diff)
[PATCH] x86-64: Move mtrr prototypes from proto.h to mtrr.h
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/mtrr.h8
-rw-r--r--include/asm-x86_64/proto.h7
2 files changed, 8 insertions, 7 deletions
diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86_64/mtrr.h
index d6135b2549bf..66809eca98cf 100644
--- a/include/asm-x86_64/mtrr.h
+++ b/include/asm-x86_64/mtrr.h
@@ -135,6 +135,14 @@ struct mtrr_gentry32
135 135
136#endif /* CONFIG_COMPAT */ 136#endif /* CONFIG_COMPAT */
137 137
138#ifdef CONFIG_MTRR
139extern void mtrr_ap_init(void);
140extern void mtrr_bp_init(void);
141#else
142#define mtrr_ap_init() do {} while (0)
143#define mtrr_bp_init() do {} while (0)
144#endif
145
138#endif /* __KERNEL__ */ 146#endif /* __KERNEL__ */
139 147
140#endif /* _LINUX_MTRR_H */ 148#endif /* _LINUX_MTRR_H */
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 98063bcb3b33..85255db1e82d 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -14,13 +14,6 @@ extern void pda_init(int);
14extern void early_idt_handler(void); 14extern void early_idt_handler(void);
15 15
16extern void mcheck_init(struct cpuinfo_x86 *c); 16extern void mcheck_init(struct cpuinfo_x86 *c);
17#ifdef CONFIG_MTRR
18extern void mtrr_ap_init(void);
19extern void mtrr_bp_init(void);
20#else
21#define mtrr_ap_init() do {} while (0)
22#define mtrr_bp_init() do {} while (0)
23#endif
24extern void init_memory_mapping(unsigned long start, unsigned long end); 17extern void init_memory_mapping(unsigned long start, unsigned long end);
25 18
26extern void system_call(void); 19extern void system_call(void);