From 06da4909712882818b3a71cae8c94da44c0e6dbd Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 2 Feb 2009 13:55:54 -0800
Subject: [PATCH] --- yaml --- r: 136717 b: refs/heads/master c:
 e4d0407185cdbdcfd99fc23bde2e5454bbc46329 h: refs/heads/master i:   136715:
 c4009d2d5864444cc9d58ef155c269486601bb2c v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86/xen/enlighten.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index ec1fe02ce7e2..559fc662c4e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5393744b71ce797f1b1546fafaed127fc50c2b61
+refs/heads/master: e4d0407185cdbdcfd99fc23bde2e5454bbc46329
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index aed7ceeb4b65..37230342c2c4 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -87,14 +87,7 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info;
  *
  * 0: not available, 1: available
  */
-static int have_vcpu_info_placement =
-#ifdef CONFIG_X86_32
-	1
-#else
-	0
-#endif
-	;
-
+static int have_vcpu_info_placement = 1;
 
 static void xen_vcpu_setup(int cpu)
 {
@@ -914,11 +907,6 @@ asmlinkage void __init xen_start_kernel(void)
 
 	machine_ops = xen_machine_ops;
 
-#ifdef CONFIG_X86_64
-	/* Disable until direct per-cpu data access. */
-	have_vcpu_info_placement = 0;
-#endif
-
 #ifdef CONFIG_X86_64
 	/*
 	 * Setup percpu state.  We only need to do this for 64-bit