Commit 730d070a authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Bogendoerfer
Browse files

MIPS: Replace deprecated CPU-hotplug functions. 



The functions get_online_cpus() and put_online_cpus() have been
deprecated during the CPU hotplug rework. They map directly to
cpus_read_lock() and cpus_read_unlock().

Replace deprecated CPU-hotplug functions with the official version.
The behavior remains unchanged.

Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent a86aadef

arch/mips/kernel/mips-mt-fpaff.c

+5 −5
Original line number Diff line number Diff line
@@ -76,13 +76,13 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, 
	if (copy_from_user(&new_mask, user_mask_ptr, sizeof(new_mask)))

		return -EFAULT;



	get_online_cpus();

	cpus_read_lock();

	rcu_read_lock();



	p = find_process_by_pid(pid);

	if (!p) {

		rcu_read_unlock();

		put_online_cpus();

		cpus_read_unlock();

		return -ESRCH;

	}
@@ -147,7 +147,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, 
	free_cpumask_var(cpus_allowed);

out_put_task:

	put_task_struct(p);

	put_online_cpus();

	cpus_read_unlock();

	return retval;

}
@@ -166,7 +166,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, 
	if (len < real_len)

		return -EINVAL;



	get_online_cpus();

	cpus_read_lock();

	rcu_read_lock();



	retval = -ESRCH;
@@ -182,7 +182,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, 


out_unlock:

	rcu_read_unlock();

	put_online_cpus();

	cpus_read_unlock();

	if (retval)

		return retval;

	if (copy_to_user(user_mask_ptr, &mask, real_len))

arch/mips/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -859,10 +859,10 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) 
	 * scheduled in then it will already have picked up the new FP mode

	 * whilst doing so.

	 */

	get_online_cpus();

	cpus_read_lock();

	for_each_cpu_and(cpu, &process_cpus, cpu_online_mask)

		work_on_cpu(cpu, prepare_for_fp_mode_switch, NULL);

	put_online_cpus();

	cpus_read_unlock();



	return 0;

}