From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 06:34:00 +0000 (+1000)
Subject: Merge branch 'signal/from-sfr'
X-Git-Tag: next-20120824~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95a3c1db67ab88d6b927106cd80a8f7b3912edd2;p=karo-tx-linux.git

Merge branch 'signal/from-sfr'

Conflicts:
	arch/alpha/kernel/process.c
	arch/arm/include/asm/thread_info.h
	arch/powerpc/kernel/entry_64.S
	arch/x86/kernel/signal.c
---

95a3c1db67ab88d6b927106cd80a8f7b3912edd2
diff --cc arch/arm/include/asm/thread_info.h
index af7b0bda3355,8564a6dcb0bc..b2d6b412172d
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@@ -148,7 -148,7 +148,6 @@@ extern int vfp_restore_user_hwstate(str
  #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */
  #define TIF_SYSCALL_TRACE	8
  #define TIF_SYSCALL_AUDIT	9
- #define TIF_POLLING_NRFLAG	16
 -#define TIF_SYSCALL_RESTARTSYS	10
  #define TIF_USING_IWMMXT	17
  #define TIF_MEMDIE		18	/* is terminating due to OOM killer */
  #define TIF_RESTORE_SIGMASK	20
@@@ -160,12 -160,13 +159,11 @@@
  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
  #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
- #define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)
  #define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)
  #define _TIF_SECCOMP		(1 << TIF_SECCOMP)
 -#define _TIF_SYSCALL_RESTARTSYS	(1 << TIF_SYSCALL_RESTARTSYS)
  
  /* Checks for any syscall work in entry-common.S */
 -#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
 -			   _TIF_SYSCALL_RESTARTSYS)
 +#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
  
  /*
   * Change these and you break ASM code in entry-common.S
diff --cc arch/x86/kernel/signal.c
index bca0ab903e57,16f61c4eb7ea..6b18d3717fec
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@@ -802,12 -797,6 +802,8 @@@ do_notify_resume(struct pt_regs *regs, 
  	}
  	if (thread_info_flags & _TIF_USER_RETURN_NOTIFY)
  		fire_user_return_notifiers();
 +
- #ifdef CONFIG_X86_32
- 	clear_thread_flag(TIF_IRET);
- #endif /* CONFIG_X86_32 */
- 
 +	rcu_user_enter();
  }
  
  void signal_fault(struct pt_regs *regs, void __user *frame, char *where)