Merge branches 'pm-cpufreq' and 'pm-devfreq'
* pm-cpufreq: acpi-cpufreq: De-register CPU notifier and free struct msr on error. * pm-devfreq: PM / devfreq: Disable Exynos4 driver build on multiplatform
This commit is contained in:
commit
88ea0f2c02
|
@ -919,7 +919,7 @@ static void __init acpi_cpufreq_boost_init(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __exit acpi_cpufreq_boost_exit(void)
|
static void acpi_cpufreq_boost_exit(void)
|
||||||
{
|
{
|
||||||
if (msrs) {
|
if (msrs) {
|
||||||
unregister_cpu_notifier(&boost_nb);
|
unregister_cpu_notifier(&boost_nb);
|
||||||
|
@ -969,9 +969,10 @@ static int __init acpi_cpufreq_init(void)
|
||||||
acpi_cpufreq_boost_init();
|
acpi_cpufreq_boost_init();
|
||||||
|
|
||||||
ret = cpufreq_register_driver(&acpi_cpufreq_driver);
|
ret = cpufreq_register_driver(&acpi_cpufreq_driver);
|
||||||
if (ret)
|
if (ret) {
|
||||||
free_acpi_perf_data();
|
free_acpi_perf_data();
|
||||||
|
acpi_cpufreq_boost_exit();
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ comment "DEVFREQ Drivers"
|
||||||
|
|
||||||
config ARM_EXYNOS4_BUS_DEVFREQ
|
config ARM_EXYNOS4_BUS_DEVFREQ
|
||||||
bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
|
bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
|
||||||
depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412
|
depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM
|
||||||
select ARCH_HAS_OPP
|
select ARCH_HAS_OPP
|
||||||
select DEVFREQ_GOV_SIMPLE_ONDEMAND
|
select DEVFREQ_GOV_SIMPLE_ONDEMAND
|
||||||
help
|
help
|
||||||
|
|
Loading…
Reference in a new issue