SUNRPC: Clean up the transport timeout initialisation

[linux-2.6] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 0c65d306f41200adaa0b60311eb7493f4d5f0939..c719bb9d79ab0dddd7a651d37b107b4368dfdd4b 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -196,7 +196,7 @@ repeat:
        /* the same process cannot be attached many times */
        if (task->ptrace & PT_PTRACED)
                goto bad;
-       retval = may_attach(task);
+       retval = __ptrace_may_attach(task);
        if (retval)
                goto bad;
 
@@ -470,6 +470,8 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
        lock_kernel();
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
+               if (!ret)
+                       arch_ptrace_attach(current);
                goto out;
        }