3 files changed, 24 insertions, 7 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 3509ca04b5bb..1afbe52d6782 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -943,6 +943,9 @@ static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy)
         struct kobject *kobj;
         struct completion *cmp;
 
+        blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                        CPUFREQ_REMOVE_POLICY, policy);
+
         down_read(&policy->rwsem);
         kobj = &policy->kobj;
         cmp = &policy->kobj_unregister;
@@ -1148,6 +1151,8 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif,
                 ret = cpufreq_add_dev_interface(policy, dev);
                 if (ret)
                         goto err_out_unregister;
+                blocking_notifier_call_chain(&cpufreq_policy_notifier_list,
+                                CPUFREQ_CREATE_POLICY, policy);
         }
 
         write_lock_irqsave(&cpufreq_driver_lock, flags);
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 4cf0d2805cb2..0f7156252453 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -277,7 +277,7 @@ static void cpufreq_stats_update_policy_cpu(struct cpufreq_policy *policy)
 static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
                 unsigned long val, void *data)
 {
-        int ret;
+        int ret = 0;
         struct cpufreq_policy *policy = data;
         struct cpufreq_frequency_table *table;
         unsigned int cpu = policy->cpu;
@@ -287,15 +287,21 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
                 return 0;
         }
 
-        if (val != CPUFREQ_NOTIFY)
-                return 0;
         table = cpufreq_frequency_get_table(cpu);
         if (!table)
                 return 0;
-        ret = cpufreq_stats_create_table(policy, table);
-        if (ret)
-                return ret;
-        return 0;
+
+        if (val == CPUFREQ_CREATE_POLICY)
+                ret = cpufreq_stats_create_table(policy, table);
+        else if (val == CPUFREQ_REMOVE_POLICY) {
+                /* This might already be freed by cpu hotplug notifier */
+                if (per_cpu(cpufreq_stats_table, cpu)) {
+                        cpufreq_stats_free_sysfs(cpu);
+                        cpufreq_stats_free_table(cpu);
+                }
+        }
+
+        return ret;
 }
 
 static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
@@ -340,6 +346,10 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
 {
         unsigned int cpu = (unsigned long)hcpu;
 
+        /* Don't free/allocate stats during suspend/resume */
+        if (action & CPU_TASKS_FROZEN)
+                return 0;
+
         switch (action) {
         case CPU_DOWN_PREPARE:
                 cpufreq_stats_free_sysfs(cpu);
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index aaf800eb9dd2..bb727eb98ed5 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -308,6 +308,8 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy)
 #define CPUFREQ_NOTIFY                  (2)
 #define CPUFREQ_START                   (3)
 #define CPUFREQ_UPDATE_POLICY_CPU       (4)
+#define CPUFREQ_CREATE_POLICY           (5)
+#define CPUFREQ_REMOVE_POLICY           (6)
 
 #ifdef CONFIG_CPU_FREQ
 int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);