---

yaml --- r: 179387 b: refs/heads/master c: e68266b h: refs/heads/master i: 179385: 47165f2 179383: 790aa86 v: v3
git-mirror · Jan 13, 2010 · 5d942c4 · 5d942c4
1 parent ea09cdf
commit 5d942c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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();