kernel26-xen/patches-2.6.25-r1/1101-2.6.25-xen-Disable-vcpu_info_placement-temporarily-FIXME.patch

From 941099351b7f546988f06fc62124da5bf35fc728 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 4 Jan 2008 11:46:49 -0200
Subject: [PATCH] Disable vcpu_info_placement temporarily (FIXME)

We are trying to make it work without it, first.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 arch/x86/xen/enlighten.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 2bec24f..53a07f6 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -121,6 +121,9 @@ static void __init xen_vcpu_setup(int cpu)
 	printk(KERN_DEBUG "trying to map vcpu_info %d at %p, mfn %llx, offset %d\n",
 	       cpu, vcpup, info.mfn, info.offset);
 
+#ifdef CONFIG_x86_32
+	/*FIXME: implement this support on x86_64 */
+
 	/* Check to see if the hypervisor will put the vcpu_info
 	   structure where we want it, which allows direct access via
 	   a percpu-variable. */
@@ -137,6 +140,10 @@ static void __init xen_vcpu_setup(int cpu)
 		printk(KERN_DEBUG "cpu %d using vcpu_info at %p\n",
 		       cpu, vcpup);
 	}
+#else
+	have_vcpu_info_placement = 0;
+#endif
+
 }
 
 static void kcons_write_dom0(const char *s, unsigned int count)
-- 
1.5.4.1

1	From 941099351b7f546988f06fc62124da5bf35fc728 Mon Sep 17 00:00:00 2001
2	From: Eduardo Habkost <ehabkost@redhat.com>
3	Date: Fri, 4 Jan 2008 11:46:49 -0200
4	Subject: [PATCH] Disable vcpu_info_placement temporarily (FIXME)
5
6	We are trying to make it work without it, first.
7
8	Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
9	---
10	arch/x86/xen/enlighten.c \| 7 +++++++
11	1 files changed, 7 insertions(+), 0 deletions(-)
12
13	diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
14	index 2bec24f..53a07f6 100644
15	--- a/arch/x86/xen/enlighten.c
16	+++ b/arch/x86/xen/enlighten.c
17	@@ -121,6 +121,9 @@ static void __init xen_vcpu_setup(int cpu)
18	printk(KERN_DEBUG "trying to map vcpu_info %d at %p, mfn %llx, offset %d\n",
19	cpu, vcpup, info.mfn, info.offset);
20
21	+#ifdef CONFIG_x86_32
22	+ /FIXME: implement this support on x86_64 /
23	+
24	/* Check to see if the hypervisor will put the vcpu_info
25	structure where we want it, which allows direct access via
26	a percpu-variable. */
27	@@ -137,6 +140,10 @@ static void __init xen_vcpu_setup(int cpu)
28	printk(KERN_DEBUG "cpu %d using vcpu_info at %p\n",
29	cpu, vcpup);
30	}
31	+#else
32	+ have_vcpu_info_placement = 0;
33	+#endif
34	+
35	}
36
37	static void kcons_write_dom0(const char *s, unsigned int count)
38	--
39	1.5.4.1
40