diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-05 18:18:03 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-06 17:00:01 +0200 |
| commit | 322a2c100a8998158445599ea437fb556aa95b11 (patch) | |
| tree | 8039af7452e0fac73f3083cb7e9c1e00d3007811 /kernel | |
| parent | fc6b177dee33365ccb29fe6d2092223cf8d679f9 (diff) | |
| download | kernel-crypto-322a2c100a8998158445599ea437fb556aa95b11.tar.gz kernel-crypto-322a2c100a8998158445599ea437fb556aa95b11.tar.xz kernel-crypto-322a2c100a8998158445599ea437fb556aa95b11.zip | |
futex: Move exit_pi_state() call to release_mm()
exit_pi_state() is called from do_exit() but not from do_execve().
Move it to release_mm() so it gets called from do_execve() as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
Cc: stable@kernel.org
Cc: Anirban Sinha <ani@anirban.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 2 | ||||
| -rw-r--r-- | kernel/fork.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index ae5d8660ddf..bc2b1fdfc35 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -989,8 +989,6 @@ NORET_TYPE void do_exit(long code) tsk->mempolicy = NULL; #endif #ifdef CONFIG_FUTEX - if (unlikely(!list_empty(&tsk->pi_state_list))) - exit_pi_state_list(tsk); if (unlikely(current->pi_state_cache)) kfree(current->pi_state_cache); #endif diff --git a/kernel/fork.c b/kernel/fork.c index 88ef51ca84d..341965b0ab1 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -553,6 +553,8 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) tsk->compat_robust_list = NULL; } #endif + if (unlikely(!list_empty(&tsk->pi_state_list))) + exit_pi_state_list(tsk); #endif /* Get rid of any cached register state */ |