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

Pull x86 fixes from Ingo Molnar:
 "Two fixes and a cleanup-fix, to the syscall entry code and to ptrace"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
  x86/ptrace: Stop setting TS_COMPAT in ptrace code
  x86/vdso: Error out if the vDSO isn't a valid DSO

diff --cc arch/x86/entry/common.c
Simple merge

diff --cc arch/x86/include/asm/thread_info.h
index b45ffdda354970ddfea35c383d6db5926f579430,f856c590c30928718682f005aaa8872c44b13bb2..84b59846154a92be76ebd630a79283c9d99b2a39
--- 1/arch/x86/include/asm/thread_info.h
--- 2/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@@ -219,8 -219,35 +219,11 @@@ static inline unsigned long current_sta
   * have to worry about atomic accesses.
   */
  #define TS_COMPAT             0x0002  /* 32bit syscall active (64BIT)*/
 -#define TS_RESTORE_SIGMASK    0x0008  /* restore signal mask in do_signal() */
+ #ifdef CONFIG_COMPAT
+ #define TS_I386_REGS_POKED    0x0004  /* regs poked by 32-bit ptracer */
+ #endif
  
  #ifndef __ASSEMBLY__
 -#define HAVE_SET_RESTORE_SIGMASK      1
 -static inline void set_restore_sigmask(void)
 -{
 -      struct thread_info *ti = current_thread_info();
 -      ti->status |= TS_RESTORE_SIGMASK;
 -      WARN_ON(!test_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags));
 -}
 -static inline void clear_restore_sigmask(void)
 -{
 -      current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
 -}
 -static inline bool test_restore_sigmask(void)
 -{
 -      return current_thread_info()->status & TS_RESTORE_SIGMASK;
 -}
 -static inline bool test_and_clear_restore_sigmask(void)
 -{
 -      struct thread_info *ti = current_thread_info();
 -      if (!(ti->status & TS_RESTORE_SIGMASK))
 -              return false;
 -      ti->status &= ~TS_RESTORE_SIGMASK;
 -      return true;
 -}
  
  static inline bool in_ia32_syscall(void)
  {

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