x86-64: conditionalize inclusion of some MTRR flavors
PATCH 1/1 x86-64: conditionalize inclusion of some MTRR flavors
Avoid inclusion of code that's dead for x86-64.
Signed-off-by Jan Beulich <[email protected]>
arch/i386/kernel/cpu/mtrr/Makefile +1 -3
@@ -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
arch/i386/kernel/cpu/mtrr/main.c +6 -0
@@ -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