summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/ptrace.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-05-29 22:13:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-05-29 22:13:55 +0100
commite94c805f0c234ef54609f23695b60add6b25ad40 (patch)
tree09e116c62b065316eb93070e78a1843d9055373a /arch/arm/kernel/ptrace.c
parentef0c14842e6e04b860d0309c5d5a3c1ead344e35 (diff)
parent70b58d896b1b30e4b89d369fbeb244c0e952cf9f (diff)
downloadop-kernel-dev-e94c805f0c234ef54609f23695b60add6b25ad40.zip
op-kernel-dev-e94c805f0c234ef54609f23695b60add6b25ad40.tar.gz
Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus
Conflicts: arch/arm/kernel/ptrace.c
Diffstat (limited to 'arch/arm/kernel/ptrace.c')
-rw-r--r--arch/arm/kernel/ptrace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 14e3826..5700a7a 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -25,6 +25,7 @@
#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,6 +918,8 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
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;
OpenPOWER on IntegriCloud