Mailing List Archive

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: 2006-10-30/xen/arch/x86/cpu/mtrr/Makefile
===================================================================
--- 2006-10-30.orig/xen/arch/x86/cpu/mtrr/Makefile 2006-11-09 14:57:55.000000000 +0100
+++ 2006-10-30/xen/arch/x86/cpu/mtrr/Makefile 2006-11-09 14:58:08.000000000 +0100
@@ -1,6 +1,6 @@
-obj-y += amd.o
-obj-y += centaur.o
-obj-y += cyrix.o
+obj-$(x86_32) += amd.o
+obj-$(x86_32) += centaur.o
+obj-$(x86_32) += cyrix.o
obj-y += generic.o
obj-y += main.o
obj-y += state.o
Index: 2006-10-30/xen/arch/x86/cpu/mtrr/main.c
===================================================================
--- 2006-10-30.orig/xen/arch/x86/cpu/mtrr/main.c 2006-11-09 14:57:55.000000000 +0100
+++ 2006-10-30/xen/arch/x86/cpu/mtrr/main.c 2006-11-10 08:58:15.000000000 +0100
@@ -64,7 +64,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

static char *mtrr_strings[MTRR_NUM_TYPES] =
{
@@ -539,9 +543,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


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel