1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 18448a7e9f86..b0c18ed8d83f 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -213,7 +213,7 @@ static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
 
 static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 {
-        int i;
+        struct cpufreq_frequency_table *pos;
         struct acpi_processor_performance *perf;
 
         if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
@@ -223,10 +223,9 @@ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 
         perf = data->acpi_data;
 
-        for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                if (msr == perf->states[data->freq_table[i].driver_data].status)
-                        return data->freq_table[i].frequency;
-        }
+        cpufreq_for_each_entry(pos, data->freq_table)
+                if (msr == perf->states[pos->driver_data].status)
+                        return pos->frequency;
         return data->freq_table[0].frequency;
 }
 
@@ -754,7 +753,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 goto err_unreg;
         }
 
-        data->freq_table = kmalloc(sizeof(*data->freq_table) *
+        data->freq_table = kzalloc(sizeof(*data->freq_table) *
                     (perf->state_count+1), GFP_KERNEL);
         if (!data->freq_table) {
                 result = -ENOMEM;
@@ -855,7 +854,6 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
         pr_debug("acpi_cpufreq_cpu_exit\n");
 
         if (data) {
-                cpufreq_frequency_table_put_attr(policy->cpu);
                 per_cpu(acfreq_data, policy->cpu) = NULL;
                 acpi_processor_unregister_performance(data->acpi_data,
                                                       policy->cpu);
@@ -907,15 +905,16 @@ static void __init acpi_cpufreq_boost_init(void)
 
                 acpi_cpufreq_driver.boost_supported = true;
                 acpi_cpufreq_driver.boost_enabled = boost_state(0);
-                get_online_cpus();
+
+                cpu_notifier_register_begin();
 
                 /* Force all MSRs to the same value */
                 boost_set_msrs(acpi_cpufreq_driver.boost_enabled,
                                cpu_online_mask);
 
-                register_cpu_notifier(&boost_nb);
+                __register_cpu_notifier(&boost_nb);
 
-                put_online_cpus();
+                cpu_notifier_register_done();
         }
 }