aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2009-06-17 19:27:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 16:03:48 -0400
commitbba7fc0a21d76ef951cdac6d11896dc6b5a9ffa7 (patch)
tree9751533ba945cf876974eaf5c3bf4251e0800b8f /arch/s390
parent02e787494ada6026074189c5268b88b7ca5cd595 (diff)
ptrace: remove PT_DTRACE from avr32, mn10300, parisc, s390, sh, xtensa
avr32, mn10300, parisc, s390, sh, xtensa: They never set PT_DTRACE, but clear it after do_execve(). Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: David Howells <dhowells@redhat.com> Acked-by: Kyle McMartin <kyle@mcmartin.ca> Cc: Grant Grundler <grundler@parisc-linux.org> Cc: Matthew Wilcox <matthew@wil.cx> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Chris Zankel <chris@zankel.net> Acked-by: Roland McGrath <roland@redhat.com> Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/compat_linux.c3
-rw-r--r--arch/s390/kernel/process.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 002c70d3cb75..9ab188d67a3d 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -461,9 +461,6 @@ asmlinkage long sys32_execve(void)
461 result = rc; 461 result = rc;
462 goto out_putname; 462 goto out_putname;
463 } 463 }
464 task_lock(current);
465 current->ptrace &= ~PT_DTRACE;
466 task_unlock(current);
467 current->thread.fp_regs.fpc=0; 464 current->thread.fp_regs.fpc=0;
468 asm volatile("sfpc %0,0" : : "d" (0)); 465 asm volatile("sfpc %0,0" : : "d" (0));
469 result = regs->gprs[2]; 466 result = regs->gprs[2];
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 355f7a30c3f1..5a43f27eec13 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -266,9 +266,6 @@ SYSCALL_DEFINE0(vfork)
266 266
267asmlinkage void execve_tail(void) 267asmlinkage void execve_tail(void)
268{ 268{
269 task_lock(current);
270 current->ptrace &= ~PT_DTRACE;
271 task_unlock(current);
272 current->thread.fp_regs.fpc = 0; 269 current->thread.fp_regs.fpc = 0;
273 if (MACHINE_HAS_IEEE) 270 if (MACHINE_HAS_IEEE)
274 asm volatile("sfpc %0,%0" : : "d" (0)); 271 asm volatile("sfpc %0,%0" : : "d" (0));