aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2008-04-30 03:52:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:36 -0400
commitac5c215383f43a106ba4ef298126bf78c126f5e9 (patch)
tree77340eea86103df7bc3b4a6c6d83f4140004bc9c /kernel/signal.c
parente62e6650e99a3dffcd0bf0d063cd818fbc13fa95 (diff)
signals: join send_sigqueue() with send_group_sigqueue()
We export send_sigqueue() and send_group_sigqueue() for the only user, posix_timer_event(). This is a bit silly, because both are just trivial helpers on top of do_send_sigqueue() and because the we pass the unused .si_signo parameter. Kill them both, rename do_send_sigqueue() to send_sigqueue(), and export it. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 367c6662b12f..d52a1fe921fa 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1240,8 +1240,7 @@ void sigqueue_free(struct sigqueue *q)
1240 __sigqueue_free(q); 1240 __sigqueue_free(q);
1241} 1241}
1242 1242
1243static int do_send_sigqueue(struct sigqueue *q, struct task_struct *t, 1243int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)
1244 int group)
1245{ 1244{
1246 int sig = q->info.si_signo; 1245 int sig = q->info.si_signo;
1247 struct sigpending *pending; 1246 struct sigpending *pending;
@@ -1266,7 +1265,6 @@ static int do_send_sigqueue(struct sigqueue *q, struct task_struct *t,
1266 * If an SI_TIMER entry is already queue just increment 1265 * If an SI_TIMER entry is already queue just increment
1267 * the overrun count. 1266 * the overrun count.
1268 */ 1267 */
1269
1270 BUG_ON(q->info.si_code != SI_TIMER); 1268 BUG_ON(q->info.si_code != SI_TIMER);
1271 q->info.si_overrun++; 1269 q->info.si_overrun++;
1272 goto out; 1270 goto out;
@@ -1283,17 +1281,6 @@ ret:
1283 return ret; 1281 return ret;
1284} 1282}
1285 1283
1286int send_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
1287{
1288 return do_send_sigqueue(q, p, 0);
1289}
1290
1291int
1292send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p)
1293{
1294 return do_send_sigqueue(q, p, 1);
1295}
1296
1297/* 1284/*
1298 * Wake up any threads in the parent blocked in wait* syscalls. 1285 * Wake up any threads in the parent blocked in wait* syscalls.
1299 */ 1286 */