From 35bef0e54edc4f32529a5765108ef96ae49fdafb Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 17 Mar 2008 16:01:20 +1100 Subject: [PATCH] --- yaml --- r: 91440 b: refs/heads/master c: 71e91a0abb839f8d2372236d8fe0513c295ec717 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/process.c | 5 ----- trunk/arch/powerpc/kernel/sys_ppc32.c | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 4337226e593a..61af620b3c2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bceabd15050d8d0e3742af350f072a110510a2aa +refs/heads/master: 71e91a0abb839f8d2372236d8fe0513c295ec717 diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c index 4846bf543a8c..7c8e3da23810 100644 --- a/trunk/arch/powerpc/kernel/process.c +++ b/trunk/arch/powerpc/kernel/process.c @@ -862,11 +862,6 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, flush_spe_to_thread(current); error = do_execve(filename, (char __user * __user *) a1, (char __user * __user *) a2, regs); - if (error == 0) { - task_lock(current); - current->ptrace &= ~PT_DTRACE; - task_unlock(current); - } putname(filename); out: return error; diff --git a/trunk/arch/powerpc/kernel/sys_ppc32.c b/trunk/arch/powerpc/kernel/sys_ppc32.c index 4a4f5c6b560b..9c3371e6958e 100644 --- a/trunk/arch/powerpc/kernel/sys_ppc32.c +++ b/trunk/arch/powerpc/kernel/sys_ppc32.c @@ -368,11 +368,6 @@ long compat_sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs); - if (error == 0) { - task_lock(current); - current->ptrace &= ~PT_DTRACE; - task_unlock(current); - } putname(filename); out: