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

Commit 1e5ce4f4 authored by Rusty Russell's avatar Rusty Russell Committed by Ingo Molnar
Browse files

sched: remove any_online_cpu() 



Impact: use new API

any_online_cpu() is a good name, but it takes a cpumask_t, not a
pointer.

There are several places where any_online_cpu() doesn't really want a
mask arg at all.  Replace all callers with cpumask_any() and
cpumask_any_and().

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3404c8d9

kernel/sched.c

+8 −6
Original line number Diff line number Diff line
@@ -5964,7 +5964,7 @@ int set_cpus_allowed_ptr(struct task_struct *p, const cpumask_t *new_mask) 
	if (cpu_isset(task_cpu(p), *new_mask))

		goto out;



	if (migrate_task(p, any_online_cpu(*new_mask), &req)) {

	if (migrate_task(p, cpumask_any_and(cpu_online_mask, new_mask), &req)) {

		/* Need help from migration thread: drop lock and wait. */

		task_rq_unlock(rq, &flags);

		wake_up_process(rq->migration_thread);
@@ -6113,11 +6113,12 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) 
		node_to_cpumask_ptr(pnodemask, cpu_to_node(dead_cpu));



		cpus_and(mask, *pnodemask, p->cpus_allowed);

		dest_cpu = any_online_cpu(mask);

		dest_cpu = cpumask_any_and(cpu_online_mask, &mask);



		/* On any allowed CPU? */

		if (dest_cpu >= nr_cpu_ids)

			dest_cpu = any_online_cpu(p->cpus_allowed);

			dest_cpu = cpumask_any_and(cpu_online_mask,

						   &p->cpus_allowed);



		/* No more Mr. Nice Guy. */

		if (dest_cpu >= nr_cpu_ids) {
@@ -6133,7 +6134,8 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) 
			 */

			rq = task_rq_lock(p, &flags);

			p->cpus_allowed = cpus_allowed;

			dest_cpu = any_online_cpu(p->cpus_allowed);

			dest_cpu = cpumask_any_and(cpu_online_mask,

						    &p->cpus_allowed);

			task_rq_unlock(rq, &flags);



			/*
@@ -6159,7 +6161,7 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p) 
 */

static void migrate_nr_uninterruptible(struct rq *rq_src)

{

	struct rq *rq_dest = cpu_rq(any_online_cpu(*CPU_MASK_ALL_PTR));

	struct rq *rq_dest = cpu_rq(cpumask_any(cpu_online_mask));

	unsigned long flags;



	local_irq_save(flags);
@@ -6524,7 +6526,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) 
			break;

		/* Unbind it from offline cpu so it can run. Fall thru. */

		kthread_bind(cpu_rq(cpu)->migration_thread,

			     any_online_cpu(cpu_online_map));

			     cpumask_any(cpu_online_mask));

		kthread_stop(cpu_rq(cpu)->migration_thread);

		cpu_rq(cpu)->migration_thread = NULL;

		break;