aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq/acpi-cpufreq.c
diff options
context:
space:
mode:
authorSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>2014-03-10 16:40:06 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 08:43:45 -0400
commit0197fbd212461f25666272b9e4654f2ccd94cff8 (patch)
treeec16f1e83efca8199ce0d51722df28772522ea0f /drivers/cpufreq/acpi-cpufreq.c
parentf0e71fcd0fa6f3f5495cd9ad3f1e4acd94446a55 (diff)
acpi-cpufreq: Fix CPU hotplug callback registration
Subsystems that want to register CPU hotplug callbacks, as well as perform initialization for the CPUs that are already online, often do it as shown below: get_online_cpus(); for_each_online_cpu(cpu) init_cpu(cpu); register_cpu_notifier(&foobar_cpu_notifier); put_online_cpus(); This is wrong, since it is prone to ABBA deadlocks involving the cpu_add_remove_lock and the cpu_hotplug.lock (when running concurrently with CPU hotplug operations). Instead, the correct and race-free way of performing the callback registration is: cpu_notifier_register_begin(); for_each_online_cpu(cpu) init_cpu(cpu); /* Note the use of the double underscored version of the API */ __register_cpu_notifier(&foobar_cpu_notifier); cpu_notifier_register_done(); Fix the acpi-cpufreq code by using this latter form of callback registration. Cc: Ingo Molnar <mingo@kernel.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/acpi-cpufreq.c')
-rw-r--r--drivers/cpufreq/acpi-cpufreq.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 18448a7e9f86..245ae078e68e 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -907,15 +907,16 @@ static void __init acpi_cpufreq_boost_init(void)
907 907
908 acpi_cpufreq_driver.boost_supported = true; 908 acpi_cpufreq_driver.boost_supported = true;
909 acpi_cpufreq_driver.boost_enabled = boost_state(0); 909 acpi_cpufreq_driver.boost_enabled = boost_state(0);
910 get_online_cpus(); 910
911 cpu_notifier_register_begin();
911 912
912 /* Force all MSRs to the same value */ 913 /* Force all MSRs to the same value */
913 boost_set_msrs(acpi_cpufreq_driver.boost_enabled, 914 boost_set_msrs(acpi_cpufreq_driver.boost_enabled,
914 cpu_online_mask); 915 cpu_online_mask);
915 916
916 register_cpu_notifier(&boost_nb); 917 __register_cpu_notifier(&boost_nb);
917 918
918 put_online_cpus(); 919 cpu_notifier_register_done();
919 } 920 }
920} 921}
921 922