diff options
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | kernel/exit.c | 5 | ||||
-rw-r--r-- | kernel/sched.c | 8 |
3 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 32e309df408c..2d1e1a1228ef 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -268,7 +268,6 @@ extern void init_idle(struct task_struct *idle, int cpu); | |||
268 | extern void init_idle_bootup_task(struct task_struct *idle); | 268 | extern void init_idle_bootup_task(struct task_struct *idle); |
269 | 269 | ||
270 | extern int runqueue_is_locked(int cpu); | 270 | extern int runqueue_is_locked(int cpu); |
271 | extern void task_rq_unlock_wait(struct task_struct *p); | ||
272 | 271 | ||
273 | extern cpumask_var_t nohz_cpu_mask; | 272 | extern cpumask_var_t nohz_cpu_mask; |
274 | #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) | 273 | #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ) |
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 | { |