Commit 1a351eef authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

x86/mtrr: 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.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210803141621.780504-8-bigeasy@linutronix.de
parent 77ad320c

arch/x86/kernel/cpu/mtrr/mtrr.c

+4 −4
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int mtrr_add_page(unsigned long base, unsigned long size, 
	replace = -1;



	/* No CPU hotplug when we change MTRR entries */

	get_online_cpus();

	cpus_read_lock();



	/* Search for existing MTRR  */

	mutex_lock(&mtrr_mutex);
@@ -398,7 +398,7 @@ int mtrr_add_page(unsigned long base, unsigned long size, 
	error = i;

 out:

	mutex_unlock(&mtrr_mutex);

	put_online_cpus();

	cpus_read_unlock();

	return error;

}
@@ -485,7 +485,7 @@ int mtrr_del_page(int reg, unsigned long base, unsigned long size) 


	max = num_var_ranges;

	/* No CPU hotplug when we change MTRR entries */

	get_online_cpus();

	cpus_read_lock();

	mutex_lock(&mtrr_mutex);

	if (reg < 0) {

		/*  Search for existing MTRR  */
@@ -520,7 +520,7 @@ int mtrr_del_page(int reg, unsigned long base, unsigned long size) 
	error = reg;

 out:

	mutex_unlock(&mtrr_mutex);

	put_online_cpus();

	cpus_read_unlock();

	return error;

}