aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2007-02-09 10:11:47 -0500
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-02-17 01:20:07 -0500
commitc3de4b38153a201cfc8561abb093a1b482fd3abb (patch)
tree30226ed724dac5502a930a0004274cdc1a506128
parentd104f11c3989b0bbe1216f6ad663d0ed91fb7bd8 (diff)
Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"
This reverts commit d3228a887cae75ef2b8b1211c31c539bef5a5698. DeBunk this code. We need it for compat_sys_rt_sigqueueinfo. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
-rw-r--r--include/linux/sched.h1
-rw-r--r--kernel/signal.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 446373535190..c9045815e62e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1329,6 +1329,7 @@ extern int kill_pgrp(struct pid *pid, int sig, int priv);
1329extern int kill_pid(struct pid *pid, int sig, int priv); 1329extern int kill_pid(struct pid *pid, int sig, int priv);
1330extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp); 1330extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
1331extern int kill_pg_info(int, struct siginfo *, pid_t); 1331extern int kill_pg_info(int, struct siginfo *, pid_t);
1332extern int kill_proc_info(int, struct siginfo *, pid_t);
1332extern void do_notify_parent(struct task_struct *, int); 1333extern void do_notify_parent(struct task_struct *, int);
1333extern void force_sig(int, struct task_struct *); 1334extern void force_sig(int, struct task_struct *);
1334extern void force_sig_specific(int, struct task_struct *); 1335extern void force_sig_specific(int, struct task_struct *);
diff --git a/kernel/signal.c b/kernel/signal.c
index 5630255d2e2a..8a04869402fb 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1137,7 +1137,8 @@ int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
1137 return error; 1137 return error;
1138} 1138}
1139 1139
1140static int kill_proc_info(int sig, struct siginfo *info, pid_t pid) 1140int
1141kill_proc_info(int sig, struct siginfo *info, pid_t pid)
1141{ 1142{
1142 int error; 1143 int error;
1143 rcu_read_lock(); 1144 rcu_read_lock();