Merge branch 'signal/from-sfr'

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

diff --cc arch/arm/include/asm/thread_info.h
index af7b0bda3355d9af850ae722b2b1f55277ef6e67,8564a6dcb0bc3b92a8037c2c115b95f61ef8b8c5..b2d6b412172d1990cedd5d873a4fdae07bbade67
--- 1/arch/arm/include/asm/thread_info.h
--- 2/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/arm/kernel/signal.c
Simple merge

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

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

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

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

diff --cc arch/mips/include/asm/thread_info.h
Simple merge

diff --cc arch/mips/kernel/scall32-o32.S
Simple merge

diff --cc arch/mips/kernel/scall64-64.S
Simple merge

diff --cc arch/mips/kernel/scall64-n32.S
Simple merge

diff --cc arch/mips/kernel/scall64-o32.S
Simple merge

diff --cc arch/mn10300/include/asm/thread_info.h
Simple merge

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

diff --cc arch/powerpc/include/asm/thread_info.h
Simple merge

diff --cc arch/s390/include/asm/thread_info.h
Simple merge

diff --cc arch/sh/kernel/cpu/sh5/entry.S
Simple merge

diff --cc arch/x86/include/asm/thread_info.h
Simple merge

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

diff --cc arch/x86/kernel/signal.c
index bca0ab903e577dd96c017cd2b1deeded1e28ea60,16f61c4eb7ea2d38fd420bf8afa8a2311dfa872f..6b18d3717fec900adf2c5f7fc67bf78012bd9646
--- 1/arch/x86/kernel/signal.c
--- 2/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)

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

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

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/timer.c
Simple merge