Messages in this thread | | | Date | Wed, 21 May 2014 14:12:31 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/x86/vdso/vdso32-setup.c between commit fa81511bb0bb ("x86-64, modify_ldt: Make support for 16-bit segments a runtime option") from Linus' tree and commit 18d0a6fd2271 ("x86, vdso: Move the 32-bit vdso special pages after the text") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/vdso/vdso32-setup.c index e1f220e3ca68,c3ed708e50f4..000000000000 --- a/arch/x86/vdso/vdso32-setup.c +++ b/arch/x86/vdso/vdso32-setup.c @@@ -36,12 -21,6 +21,10 @@@ #define VDSO_DEFAULT 1 #endif +#ifdef CONFIG_X86_64 - #define vdso_enabled sysctl_vsyscall32 - #define arch_setup_additional_pages syscall32_setup_pages +extern int sysctl_ldt16; +#endif + /* * Should the kernel map a VDSO page into processes and pass its * address down to glibc upon exec()? [unhandled content-type:application/pgp-signature] | |