From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Aug 2016 13:04:35 +0000 (-0400)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.8-rc1~14
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=c98f5827f8f0e0cb075075def7f0d210992ef06d

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

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
---

c98f5827f8f0e0cb075075def7f0d210992ef06d
diff --cc arch/x86/include/asm/thread_info.h
index b45ffdda3549,f856c590c309..84b59846154a
--- a/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)*/
+ #ifdef CONFIG_COMPAT
+ #define TS_I386_REGS_POKED	0x0004	/* regs poked by 32-bit ptracer */
+ #endif
 -#define TS_RESTORE_SIGMASK	0x0008	/* restore signal mask in do_signal() */
  
  #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)
  {