diff options
author | Oleg Nesterov <oleg@redhat.com> | 2010-05-26 17:43:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:12:46 -0400 |
commit | b7b8ff6373d4b910af081f76888395e6df53249d (patch) | |
tree | 128a1b2cf026fb8b9791eaefb6f79f872999a5c6 /kernel | |
parent | 4ada856fb0ee62f6fe3aac3de726deac0640d929 (diff) |
signals: kill the awful task_rq_unlock_wait() hack
Now that task->signal can't go away we can revert the horrible hack added
by ad474caca3e2a0550b7ce0706527ad5ab389a4d4 ("fix for
account_group_exec_runtime(), make sure ->signal can't be freed under
rq->lock").
And we can do more cleanups sched_stats.h/posix-cpu-timers.c later.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: 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')
-rw-r--r-- | kernel/exit.c | 5 | ||||
-rw-r--r-- | kernel/sched.c | 8 |
2 files changed, 0 insertions, 13 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 356d91fa095f..bbc790646502 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -145,11 +145,6 @@ static void __exit_signal(struct task_struct *tsk) | |||
145 | if (sig) { | 145 | if (sig) { |
146 | flush_sigqueue(&sig->shared_pending); | 146 | flush_sigqueue(&sig->shared_pending); |
147 | taskstats_tgid_free(sig); | 147 | taskstats_tgid_free(sig); |
148 | /* | ||
149 | * Make sure ->signal can't go away under rq->lock, | ||
150 | * see account_group_exec_runtime(). | ||
151 | */ | ||
152 | task_rq_unlock_wait(tsk); | ||
153 | tty_kref_put(tty); | 148 | tty_kref_put(tty); |
154 | } | 149 | } |
155 | } | 150 | } |
diff --git a/kernel/sched.c b/kernel/sched.c index 054a6012de99..15b93f617fd7 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -969,14 +969,6 @@ static struct rq *task_rq_lock(struct task_struct *p, unsigned long *flags) | |||
969 | } | 969 | } |
970 | } | 970 | } |
971 | 971 | ||
972 | void task_rq_unlock_wait(struct task_struct *p) | ||
973 | { | ||
974 | struct rq *rq = task_rq(p); | ||
975 | |||
976 | smp_mb(); /* spin-unlock-wait is not a full memory barrier */ | ||
977 | raw_spin_unlock_wait(&rq->lock); | ||
978 | } | ||
979 | |||
980 | static void __task_rq_unlock(struct rq *rq) | 972 | static void __task_rq_unlock(struct rq *rq) |
981 | __releases(rq->lock) | 973 | __releases(rq->lock) |
982 | { | 974 | { |