Commit 95ac7067 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Rafael J. Wysocki
Browse files

ACPI: processor: Replace deprecated CPU-hotplug functions 



The functions cpu_hotplug_begin, cpu_hotplug_done, get_online_cpus() and
put_online_cpus() have been deprecated during the CPU hotplug rework. They map
directly to cpus_write_lock(), cpus_write_unlock, 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 avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c500bee1

drivers/acpi/acpi_pad.c

+2 −2
Original line number Diff line number Diff line
@@ -249,12 +249,12 @@ static void set_power_saving_task_num(unsigned int num) 


static void acpi_pad_idle_cpus(unsigned int num_cpus)

{

	get_online_cpus();

	cpus_read_lock();



	num_cpus = min_t(unsigned int, num_cpus, num_online_cpus());

	set_power_saving_task_num(num_cpus);



	put_online_cpus();

	cpus_read_unlock();

}



static uint32_t acpi_pad_idle_cpus_num(void)

drivers/acpi/acpi_processor.c

+4 −4
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
		return -ENODEV;



	cpu_maps_update_begin();

	cpu_hotplug_begin();

	cpus_write_lock();



	ret = acpi_map_cpu(pr->handle, pr->phys_id, pr->acpi_id, &pr->id);

	if (ret)
@@ -203,7 +203,7 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
	pr->flags.need_hotplug_init = 1;



out:

	cpu_hotplug_done();

	cpus_write_unlock();

	cpu_maps_update_done();

	return ret;

}
@@ -454,13 +454,13 @@ static void acpi_processor_remove(struct acpi_device *device) 
	per_cpu(processors, pr->id) = NULL;



	cpu_maps_update_begin();

	cpu_hotplug_begin();

	cpus_write_lock();



	/* Remove the CPU. */

	arch_unregister_cpu(pr->id);

	acpi_unmap_cpu(pr->id);



	cpu_hotplug_done();

	cpus_write_unlock();

	cpu_maps_update_done();



	try_offline_node(cpu_to_node(pr->id));

drivers/acpi/processor_idle.c

+2 −2
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ int acpi_processor_power_state_has_changed(struct acpi_processor *pr) 
	if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {



		/* Protect against cpu-hotplug */

		get_online_cpus();

		cpus_read_lock();

		cpuidle_pause_and_lock();



		/* Disable all cpuidle devices */
@@ -1330,7 +1330,7 @@ int acpi_processor_power_state_has_changed(struct acpi_processor *pr) 
			}

		}

		cpuidle_resume_and_unlock();

		put_online_cpus();

		cpus_read_unlock();

	}



	return 0;