Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[platform/kernel/linux-rpi.git] / arch / arm / kernel / ptrace.c

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 2b945b9..c421a89 100644 (file)
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -781,8 +781,9 @@ long arch_ptrace(struct task_struct *child, long request,
                        break;
 
                case PTRACE_SET_SYSCALL:
-                       task_thread_info(child)->abi_syscall = data &
-                                                       __NR_SYSCALL_MASK;
+                       if (data != -1)
+                               data &= __NR_SYSCALL_MASK;
+                       task_thread_info(child)->abi_syscall = data;
                        ret = 0;
                        break;