OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
cpufreq
/
acpi-cpufreq.c
diff --git
a/drivers/cpufreq/acpi-cpufreq.c
b/drivers/cpufreq/acpi-cpufreq.c
index
822ca03
..
000e4e0
100644
(file)
--- a/
drivers/cpufreq/acpi-cpufreq.c
+++ b/
drivers/cpufreq/acpi-cpufreq.c
@@
-754,7
+754,7
@@
static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
goto err_unreg;
}
goto err_unreg;
}
- data->freq_table = k
m
alloc(sizeof(*data->freq_table) *
+ data->freq_table = k
z
alloc(sizeof(*data->freq_table) *
(perf->state_count+1), GFP_KERNEL);
if (!data->freq_table) {
result = -ENOMEM;
(perf->state_count+1), GFP_KERNEL);
if (!data->freq_table) {
result = -ENOMEM;
@@
-906,15
+906,16
@@
static void __init acpi_cpufreq_boost_init(void)
acpi_cpufreq_driver.boost_supported = true;
acpi_cpufreq_driver.boost_enabled = boost_state(0);
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);
/* 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
();
}
}
}
}