From 3ec72643bcf77475cdbc086f2aa4791cc115550e Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Sat, 12 Jul 2008 02:22:06 -0700
Subject: [PATCH] --- yaml --- r: 104457 b: refs/heads/master c:
 d5303b811b9d6dad2e7396d545eb7db414d42a61 h: refs/heads/master i:   104455:
 58efd34c4b4bada7f1a81713fbd9f814da7bad54 v: v3

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

diff --git a/[refs] b/[refs]
index b04f049e0d4c..ddbcfbbb1d4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a52e4b1cddd90fbfde8fb67021657936ee74b07
+refs/heads/master: d5303b811b9d6dad2e7396d545eb7db414d42a61
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
index e3648e64a637..b6acc3a0af46 100644
--- a/trunk/arch/x86/xen/setup.c
+++ b/trunk/arch/x86/xen/setup.c
@@ -137,7 +137,7 @@ void __cpuinit xen_enable_syscall(void)
 
 	ret = register_callback(CALLBACKTYPE_syscall, xen_syscall_target);
 	if (ret != 0) {
-		printk(KERN_ERR "Failed to set syscall: %d\n", ret);
+		printk(KERN_ERR "Failed to set syscall callback: %d\n", ret);
 		/* Pretty fatal; 64-bit userspace has no other
 		   mechanism for syscalls. */
 	}
@@ -145,13 +145,8 @@ void __cpuinit xen_enable_syscall(void)
 	if (boot_cpu_has(X86_FEATURE_SYSCALL32)) {
 		ret = register_callback(CALLBACKTYPE_syscall32,
 					xen_syscall32_target);
-		if (ret != 0) {
-			printk(KERN_INFO "Xen: 32-bit syscall not supported: disabling vdso\n");
+		if (ret != 0)
 			setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);
-#ifdef CONFIG_COMPAT
-			sysctl_vsyscall32 = 0;
-#endif
-		}
 	}
 #endif /* CONFIG_X86_64 */
 }