Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7b8ff63 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

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 ad474cac ("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: default avatarOleg 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: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4ada856f

include/linux/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ extern void init_idle(struct task_struct *idle, int cpu); 
extern void init_idle_bootup_task(struct task_struct *idle);



extern int runqueue_is_locked(int cpu);

extern void task_rq_unlock_wait(struct task_struct *p);



extern cpumask_var_t nohz_cpu_mask;

#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)

kernel/exit.c

+0 −5
Original line number Diff line number Diff line
@@ -145,11 +145,6 @@ static void __exit_signal(struct task_struct *tsk) 
	if (sig) {

		flush_sigqueue(&sig->shared_pending);

		taskstats_tgid_free(sig);

		/*

		 * Make sure ->signal can't go away under rq->lock,

		 * see account_group_exec_runtime().

		 */

		task_rq_unlock_wait(tsk);

		tty_kref_put(tty);

	}

}

kernel/sched.c

+0 −8
Original line number Diff line number Diff line
@@ -969,14 +969,6 @@ static struct rq *task_rq_lock(struct task_struct *p, unsigned long *flags) 
	}

}



void task_rq_unlock_wait(struct task_struct *p)

{

	struct rq *rq = task_rq(p);



	smp_mb(); /* spin-unlock-wait is not a full memory barrier */

	raw_spin_unlock_wait(&rq->lock);

}



static void __task_rq_unlock(struct rq *rq)

	__releases(rq->lock)

{