mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

x86: xen: no need to disable vdso32 

Now that the vdso32 code can cope with both syscall and sysenter
missing for 32-bit compat processes, just disable the features without
disabling vdso altogether.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Jeremy Fitzhardinge 2008-07-12 02:22:06 -07:00 committed by Ingo Molnar
parent 6a52e4b1cd
commit d5303b811b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/xen/setup.c
View File

@ -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 */
}