From: Rafael J. Wysocki <[email protected]>

Loops over online CPUs in cpufreq_stats_init() and cpufreq_stats_exit()
should be carried out with CPU offline/online locked or races are
possible otherwise, so make that happen.

Signed-off-by: Rafael J. Wysocki <[email protected]>
---
 drivers/cpufreq/cpufreq_stats.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Index: linux-pm/drivers/cpufreq/cpufreq_stats.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_stats.c
+++ linux-pm/drivers/cpufreq/cpufreq_stats.c
@@ -322,6 +322,8 @@ static int __init cpufreq_stats_init(voi
        if (ret)
                return ret;
 
+       get_online_cpus();
+
        for_each_online_cpu(cpu)
                cpufreq_stats_create_table(cpu);
 
@@ -332,21 +334,27 @@ static int __init cpufreq_stats_init(voi
                                CPUFREQ_POLICY_NOTIFIER);
                for_each_online_cpu(cpu)
                        cpufreq_stats_free_table(cpu);
-               return ret;
        }
 
-       return 0;
+       put_online_cpus();
+
+       return ret;
 }
 static void __exit cpufreq_stats_exit(void)
 {
        unsigned int cpu;
 
+       get_online_cpus();
+
        cpufreq_unregister_notifier(&notifier_policy_block,
                        CPUFREQ_POLICY_NOTIFIER);
        cpufreq_unregister_notifier(&notifier_trans_block,
                        CPUFREQ_TRANSITION_NOTIFIER);
+
        for_each_online_cpu(cpu)
                cpufreq_stats_free_table(cpu);
+
+       put_online_cpus();
 }
 
 MODULE_AUTHOR("Zou Nan hai <[email protected]>");

Reply via email to