From 9548dc4d691c8718a0c05c15db6a8a6ef202b1b2 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 6 Dec 2006 20:38:22 -0800
Subject: [PATCH] --- yaml --- r: 42869 b: refs/heads/master c:
 d3228a887cae75ef2b8b1211c31c539bef5a5698 h: refs/heads/master i:   42867:
 27e2111c75676240afb9cc71581c979572be1502 v: v3

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

diff --git a/[refs] b/[refs]
index 0fb93d52cbf4..1f3aaec4aece 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebe7e5fe4b41deeb2731c5b52d8c8e6ac08b1f74
+refs/heads/master: d3228a887cae75ef2b8b1211c31c539bef5a5698
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 0a90cefb0b0d..3a767242e72f 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1305,7 +1305,6 @@ extern int kill_pgrp(struct pid *pid, int sig, int priv);
 extern int kill_pid(struct pid *pid, int sig, int priv);
 extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
 extern int kill_pg_info(int, struct siginfo *, pid_t);
-extern int kill_proc_info(int, struct siginfo *, pid_t);
 extern void do_notify_parent(struct task_struct *, int);
 extern void force_sig(int, struct task_struct *);
 extern void force_sig_specific(int, struct task_struct *);
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index bc972d7e6319..ec81defde339 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1134,8 +1134,7 @@ int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
 	return error;
 }
 
-int
-kill_proc_info(int sig, struct siginfo *info, pid_t pid)
+static int kill_proc_info(int sig, struct siginfo *info, pid_t pid)
 {
 	int error;
 	rcu_read_lock();