diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-28 08:31:31 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-07-28 08:31:31 -0400 |
commit | 54b371e002ee69a47e051e02702bf4eb1a360bab (patch) | |
tree | 123385fd61821a1bf918697b6ef92cb4359a6b1f /kernel/exit.c | |
parent | b49f8d26493ee0c1f016115ad25912571c284411 (diff) | |
parent | f9d9cfe4fa444b93238d7c3cf07af2dd85b151e8 (diff) |
Merge branch 'rt/core' into rt/base
Conflicts:
kernel/spinlock.c
lib/kernel_lock.c
Manual fixup of kernel/rwlocks.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index aed4d2e8a66a..a27d47d3d0c8 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -130,7 +130,7 @@ static void __exit_signal(struct task_struct *tsk) | |||
130 | * Do this under ->siglock, we can race with another thread | 130 | * Do this under ->siglock, we can race with another thread |
131 | * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals. | 131 | * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals. |
132 | */ | 132 | */ |
133 | flush_sigqueue(&tsk->pending); | 133 | flush_task_sigqueue(tsk); |
134 | 134 | ||
135 | tsk->signal = NULL; | 135 | tsk->signal = NULL; |
136 | tsk->sighand = NULL; | 136 | tsk->sighand = NULL; |