diff options
| author |   Jan Beulich <jbeulich@novell.com> | 2006-12-07 02:14:09 +0100 |
|---|---|---|
| committer |   Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:09 +0100 |
| commit | 475850c86b908ae026d5a4be02a1b1e9c408c75a (patch) | |
| tree | f6db38884b5c3433e612730bbb0fb6dde1e8a7f8 | |
| parent | [PATCH] x86-64: remove prototype of free_bootmem_generic() (diff) | |
| download | linux-dev-475850c86b908ae026d5a4be02a1b1e9c408c75a.tar.xz linux-dev-475850c86b908ae026d5a4be02a1b1e9c408c75a.zip | |
[PATCH] i386: conditionalize inclusion of some MTRR flavors
Avoid inclusion of code that's dead for x86-64.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/Makefile | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/mtrr/main.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/i386/kernel/cpu/mtrr/Makefile b/arch/i386/kernel/cpu/mtrr/Makefile index a25b701ab84e..191fc0533649 100644 --- a/arch/i386/kernel/cpu/mtrr/Makefile +++ b/arch/i386/kernel/cpu/mtrr/Makefile @@ -1,5 +1,3 @@ obj-y := main.o if.o generic.o state.o -obj-y += amd.o -obj-y += cyrix.o -obj-y += centaur.o +obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c index 2b8b0b361ccb..a4de30b9d3d3 100644 --- a/arch/i386/kernel/cpu/mtrr/main.c +++ b/arch/i386/kernel/cpu/mtrr/main.c @@ -59,7 +59,11 @@ struct mtrr_ops * mtrr_if = NULL; static void set_mtrr(unsigned int reg, unsigned long base, unsigned long size, mtrr_type type); +#ifndef CONFIG_X86_64 extern int arr3_protected; +#else +#define arr3_protected 0 +#endif void set_mtrr_ops(struct mtrr_ops * ops) { @@ -544,9 +548,11 @@ extern void centaur_init_mtrr(void); static void __init init_ifs(void) { +#ifndef CONFIG_X86_64 amd_init_mtrr(); cyrix_init_mtrr(); centaur_init_mtrr(); +#endif } /* The suspend/resume methods are only for CPU without MTRR. CPU using generic |