diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-04-30 03:52:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:36 -0400 |
commit | ac5c215383f43a106ba4ef298126bf78c126f5e9 (patch) | |
tree | 77340eea86103df7bc3b4a6c6d83f4140004bc9c /kernel/posix-timers.c | |
parent | e62e6650e99a3dffcd0bf0d063cd818fbc13fa95 (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/posix-timers.c')
-rw-r--r-- | kernel/posix-timers.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 8476956ffd92..dbd8398ddb0b 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -310,8 +310,7 @@ int posix_timer_event(struct k_itimer *timr,int si_private) | |||
310 | 310 | ||
311 | if (timr->it_sigev_notify & SIGEV_THREAD_ID) { | 311 | if (timr->it_sigev_notify & SIGEV_THREAD_ID) { |
312 | struct task_struct *leader; | 312 | struct task_struct *leader; |
313 | int ret = send_sigqueue(timr->it_sigev_signo, timr->sigq, | 313 | int ret = send_sigqueue(timr->sigq, timr->it_process, 0); |
314 | timr->it_process); | ||
315 | 314 | ||
316 | if (likely(ret >= 0)) | 315 | if (likely(ret >= 0)) |
317 | return ret; | 316 | return ret; |
@@ -322,8 +321,7 @@ int posix_timer_event(struct k_itimer *timr,int si_private) | |||
322 | timr->it_process = leader; | 321 | timr->it_process = leader; |
323 | } | 322 | } |
324 | 323 | ||
325 | return send_group_sigqueue(timr->it_sigev_signo, timr->sigq, | 324 | return send_sigqueue(timr->sigq, timr->it_process, 1); |
326 | timr->it_process); | ||
327 | } | 325 | } |
328 | EXPORT_SYMBOL_GPL(posix_timer_event); | 326 | EXPORT_SYMBOL_GPL(posix_timer_event); |
329 | 327 | ||