Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal...

Conflicts:
	arch/arm/kernel/ptrace.c

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

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/kernel/ptrace.c
index 14e38261cd31db9d852db2eb0b8046251a04613d,688a0a970c71ba0668ec2f56af31fe4fdf77b38c..5700a7ae7f0bc1511ae048d7a3f025c401e5729c
--- 1/arch/arm/kernel/ptrace.c
--- 2/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@@ -24,7 -24,7 +24,8 @@@
  #include <linux/hw_breakpoint.h>
  #include <linux/regset.h>
  #include <linux/audit.h>
 +#include <linux/tracehook.h>
+ #include <linux/unistd.h>
  
  #include <asm/pgtable.h>
  #include <asm/traps.h>
@@@ -917,8 -917,12 +918,10 @@@ asmlinkage int syscall_trace(int why, s
                audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0,
                                    regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);
  
+       if (why == 0 && test_and_clear_thread_flag(TIF_SYSCALL_RESTARTSYS))
+               scno = __NR_restart_syscall - __NR_SYSCALL_BASE;
        if (!test_thread_flag(TIF_SYSCALL_TRACE))
                return scno;
 -      if (!(current->ptrace & PT_PTRACED))
 -              return scno;
  
        current_thread_info()->syscall = scno;
  

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

diff --cc arch/arm/kernel/traps.c
Simple merge