Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 vdso updates from Ingo Molnar:
 "The main changes in this cycle centered around adding support for
  32-bit compatible C/R of the vDSO on 64-bit kernels, by Dmitry
  Safonov"

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Use CONFIG_X86_X32_ABI to enable vdso prctl
  x86/vdso: Only define map_vdso_randomized() if CONFIG_X86_64
  x86/vdso: Only define prctl_map_vdso() if CONFIG_CHECKPOINT_RESTORE
  x86/signal: Add SA_{X32,IA32}_ABI sa_flags
  x86/ptrace: Down with test_thread_flag(TIF_IA32)
  x86/coredump: Use pr_reg size, rather that TIF_IA32 flag
  x86/arch_prctl/vdso: Add ARCH_MAP_VDSO_*
  x86/vdso: Replace calculate_addr in map_vdso() with addr
  x86/vdso: Unmap vdso blob on vvar mapping failure

diff --cc arch/x86/kernel/process_64.c
index de9acaf2d371b8dd8fb23e94a6384e89ef4751b0,b4603b71a65905067f817d835b20ad2009b55e69..ee944bd2310d8b0017954e558d6067c3e85b3001
--- 1/arch/x86/kernel/process_64.c
--- 2/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@@ -49,7 -49,10 +49,8 @@@
  #include <asm/debugreg.h>
  #include <asm/switch_to.h>
  #include <asm/xen/hypervisor.h>
+ #include <asm/vdso.h>
  
 -asmlinkage extern void ret_from_fork(void);
 -
  __visible DEFINE_PER_CPU(unsigned long, rsp_scratch);
  
  /* Prints also some state that isn't saved in the pt_regs */

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc mm/mmap.c
Simple merge