From fcbb12d286c627e8469ec71919dec699cb46eb40 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sat, 18 Oct 2008 20:28:21 -0700
Subject: [PATCH] --- yaml --- r: 115945 b: refs/heads/master c:
 b747c8c102cc0677a7a8056a093f58d7c9b500e7 h: refs/heads/master i:   115943:
 6b2024e6b9846d1dbf7775edd6a3ae06807aed3d v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ptrace.h | 1 -
 trunk/kernel/ptrace.c        | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6fd846f6a3a0..21b4069f6abd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4596435404976b0ded9cdf18b456ca2e1408ddd
+refs/heads/master: b747c8c102cc0677a7a8056a093f58d7c9b500e7
diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h
index ea7416c901d1..22641d5d45df 100644
--- a/trunk/include/linux/ptrace.h
+++ b/trunk/include/linux/ptrace.h
@@ -94,7 +94,6 @@ extern void ptrace_notify(int exit_code);
 extern void __ptrace_link(struct task_struct *child,
 			  struct task_struct *new_parent);
 extern void __ptrace_unlink(struct task_struct *child);
-extern void ptrace_untrace(struct task_struct *child);
 #define PTRACE_MODE_READ   1
 #define PTRACE_MODE_ATTACH 2
 /* Returns 0 on success, -errno on denial. */
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 356699a96d56..1e68e4c39e2c 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -45,7 +45,7 @@ void __ptrace_link(struct task_struct *child, struct task_struct *new_parent)
  * TASK_TRACED, resume it now.
  * Requires that irqs be disabled.
  */
-void ptrace_untrace(struct task_struct *child)
+static void ptrace_untrace(struct task_struct *child)
 {
 	spin_lock(&child->sighand->siglock);
 	if (task_is_traced(child)) {