diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-03 03:02:03 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-21 20:39:11 +0200 |
| commit | 6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252 (patch) | |
| tree | 2bf168797818da579310adcd192765fcbe34ae87 /arch/arm/kernel/ptrace.c | |
| parent | arm: if we get into work_pending while returning to kernel mode, just go away (diff) | |
| download | linux-6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252.tar.xz linux-6b5c8045ecc7e726cdaa2a9d9c8e5008050e1252.zip | |
arm: new way of handling ERESTART_RESTARTBLOCK
new "syscall start" flag; handled in syscall_trace() by switching
syscall number to that of syscall_restart(2). Restarts of that
kind (ERESTART_RESTARTBLOCK) are handled by setting that bit;
syscall number is not modified until the actual call.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/ptrace.c')
| -rw-r--r-- | arch/arm/kernel/ptrace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 9650c143afc1..d407ebf41801 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -24,6 +24,7 @@ #include <linux/hw_breakpoint.h> #include <linux/regset.h> #include <linux/audit.h> +#include <linux/unistd.h> #include <asm/pgtable.h> #include <asm/traps.h> @@ -916,6 +917,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; if (!(current->ptrace & PT_PTRACED)) |