From 58efd34c4b4bada7f1a81713fbd9f814da7bad54 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 11 Jul 2008 22:41:34 +0200
Subject: [PATCH] --- yaml --- r: 104455 b: refs/heads/master c:
 71415c6a0877d5944d5dc3060f3b03513746158d h: refs/heads/master i:   104453:
 1696850a2a4325f9ab5d360cc79caf9e6ff6a455   104451:
 fc2e26f8240c53032932848d5294fe07f356ac41   104447:
 36ecbd682292842230ecb63974d9cd4cffc150ab v: v3

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

diff --git a/[refs] b/[refs]
index 35bd476e397a..4bc276aa3430 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62541c376668042e20122864a044360707b2fb82
+refs/heads/master: 71415c6a0877d5944d5dc3060f3b03513746158d
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
index 9cce4a92aac0..3e11779755c3 100644
--- a/trunk/arch/x86/xen/setup.c
+++ b/trunk/arch/x86/xen/setup.c
@@ -144,7 +144,9 @@ void __cpuinit xen_enable_syscall(void)
 		if (ret != 0) {
 			printk(KERN_INFO "Xen: 32-bit syscall not supported: disabling vdso\n");
 			setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);
+#ifdef CONFIG_COMPAT
 			sysctl_vsyscall32 = 0;
+#endif
 		}
 	}
 #endif /* CONFIG_X86_64 */