x86, xen, vdso: fix build error, add sysctl_vsyscall32
PATCH 1/1 x86, xen, vdso: fix build error, add sysctl_vsyscall32
commit c187263834465c2beededb4d19e7f6bab18cc757
Author: Ingo Molnar <[email protected]> Date: Fri Jul 11 22:34:26 2008 +0200
x86, xen, vdso: fix build error, add sysctl_vsyscall32
Xen recently tried to make use of sysctl_vsyscall32, with this result:
arch/x86/xen/built-in.o: In function `xen_enable_syscall':
(.cpuinit.text+0xdb): undefined reference to `sysctl_vsyscall32'
turns out when sysctl_vsyscall32 use was introduced, the variable was not defined anywhere.
--- arch/x86/vdso/vdso32-setup.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/vdso/vdso32-setup.c +2 -0
@@ -377,6 +377,8 @@ __initcall(sysenter_setup);/* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h> +int sysctl_vsyscall32; +static ctl_table abi_table2[] = { { .procname ="vsyscall32" ,
arch/x86/vdso/vdso32-setup.c __initcall(sysenter_setup); · line 381
Quoted 2 lines · Ingo Molnar
arch/x86/vdso/vdso32-setup.c +2
-0+int sysctl_vsyscall32; +
ah, the trick is:
#ifdef CONFIG_X86_64
#define vdso_enabled sysctl_vsyscall32
#define arch_setup_additional_pages syscall32_setup_pages
#endif
so disregard my patch. The real fix is the one below, for tip/xen-64bit.
Ingo