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)) {