diff --git a/[refs] b/[refs]
index 5c1e742f55c8..cd0a2d1b7896 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f0f616bb093823b70855685cf085d39a8784818
+refs/heads/master: 6ea6dd93c9454cc9521134f907bc970d09f460e4
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index c25db863081d..c719bb9d79ab 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -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;
 	}