From e37e3132b2c82431dc491bf6d94bdf7df373a596 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 30 Apr 2008 00:53:15 -0700
Subject: [PATCH] --- yaml --- r: 95155 b: refs/heads/master c:
 00cd5c37afd5f431ac186dd131705048c0a11fdb h: refs/heads/master i:   95153:
 273edf356a3413ca39b88a256c8e80d5a881bc16   95151:
 7dedeb5664d65d945bc4971236c131fafe54e172 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/ptrace.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ea30a18fd495..091b85acb76b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33e9fc7d01269737cd5a3b6de1db9d0e796ab708
+refs/heads/master: 00cd5c37afd5f431ac186dd131705048c0a11fdb
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 5f8d452e8111..dcc199c43a12 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -168,8 +168,6 @@ int ptrace_attach(struct task_struct *task)
 	audit_ptrace(task);
 
 	retval = -EPERM;
-	if (task->pid <= 1)
-		goto out;
 	if (same_thread_group(task, current))
 		goto out;
 
@@ -521,12 +519,6 @@ struct task_struct *ptrace_get_task_struct(pid_t pid)
 {
 	struct task_struct *child;
 
-	/*
-	 * Tracing init is not allowed.
-	 */
-	if (pid == 1)
-		return ERR_PTR(-EPERM);
-
 	read_lock(&tasklist_lock);
 	child = find_task_by_vpid(pid);
 	if (child)