From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 29 May 2012 21:13:55 +0000 (+0100)
Subject: Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e94c805f0c234ef54609f23695b60add6b25ad40;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-arm' of git://git./linux/kernel/git/viro/signal.git into for-linus

Conflicts:
	arch/arm/kernel/ptrace.c
---

e94c805f0c234ef54609f23695b60add6b25ad40
diff --cc arch/arm/kernel/ptrace.c
index 14e38261cd31,688a0a970c71..5700a7ae7f0b
--- a/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;