diff options
| author |   James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /kernel/signal.c | |
| parent | Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | nommu: Provide mmap_min_addr definition. (diff) | |
| download | wireguard-linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.xz wireguard-linux-73fbad283cfbbcf02939bdbda31fc4a30e729cca.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index d8034737db4c..d2dd9cf5dcc6 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -249,14 +249,19 @@ void flush_sigqueue(struct sigpending *queue) /* * Flush all pending signals for a task. */ +void __flush_signals(struct task_struct *t) +{ + clear_tsk_thread_flag(t, TIF_SIGPENDING); + flush_sigqueue(&t->pending); + flush_sigqueue(&t->signal->shared_pending); +} + void flush_signals(struct task_struct *t) { unsigned long flags; spin_lock_irqsave(&t->sighand->siglock, flags); - clear_tsk_thread_flag(t, TIF_SIGPENDING); - flush_sigqueue(&t->pending); - flush_sigqueue(&t->signal->shared_pending); + __flush_signals(t); spin_unlock_irqrestore(&t->sighand->siglock, flags); } |