diff options
| author |   Andi Kleen <ak@suse.de> | 2007-05-02 19:27:17 +0200 |
|---|---|---|
| committer |   Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:17 +0200 |
| commit | 856f44ff4af6e57fdc39a8b2bec498c88438bd27 (patch) | |
| tree | 475ca01f27c3272ec9e3d15f3d8209ad4424c3bc /include | |
| parent | [PATCH] i386: Clean up ELF note generation (diff) | |
| download | linux-dev-856f44ff4af6e57fdc39a8b2bec498c88438bd27.tar.xz linux-dev-856f44ff4af6e57fdc39a8b2bec498c88438bd27.zip | |
[PATCH] x86-64: Move mtrr prototypes from proto.h to mtrr.h
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/mtrr.h | 8 | ||||
| -rw-r--r-- | include/asm-x86_64/proto.h | 7 |
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 #endif /* CONFIG_COMPAT */ +#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 + #endif /* __KERNEL__ */ #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); extern void early_idt_handler(void); extern void mcheck_init(struct cpuinfo_x86 *c); -#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 extern void init_memory_mapping(unsigned long start, unsigned long end); extern void system_call(void); |