From 5d942c4be11415a929ebab38feb35c013fb216d4 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 13 Jan 2010 10:16:08 +0000
Subject: [PATCH] --- yaml --- r: 179387 b: refs/heads/master c:
 e68266b7001a4e29af083716f0c36c0d6dbb1b39 h: refs/heads/master i:   179385:
 47165f2fa8bc63fae5a6ad4f9812a2696411be68   179383:
 790aa8666c4b2f6571543eeb64ac0f1f3b347c80 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 40d2aec5926f..fa8d848980cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 864a0922dd128392467611d9857e5138c6a91999
+refs/heads/master: e68266b7001a4e29af083716f0c36c0d6dbb1b39
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index 2b26dd5930c6..36daccb68642 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1151,9 +1151,13 @@ asmlinkage void __init xen_start_kernel(void)
 
 	/* keep using Xen gdt for now; no urgent need to change it */
 
+#ifdef CONFIG_X86_32
 	pv_info.kernel_rpl = 1;
 	if (xen_feature(XENFEAT_supervisor_mode_kernel))
 		pv_info.kernel_rpl = 0;
+#else
+	pv_info.kernel_rpl = 0;
+#endif
 
 	/* set the limit of our address space */
 	xen_reserve_top();