tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Rafael J. Wysocki 88ea0f2c 82e18059

+5 -4
unified split
+4 -3
drivers/cpufreq/acpi-cpufreq.c
··· 919 } 920 } 921 922 - static void __exit acpi_cpufreq_boost_exit(void) 923 { 924 if (msrs) { 925 unregister_cpu_notifier(&boost_nb); ··· 969 acpi_cpufreq_boost_init(); 970 971 ret = cpufreq_register_driver(&acpi_cpufreq_driver); 972 - if (ret) 973 free_acpi_perf_data(); 974 - 975 return ret; 976 } 977
··· 919 } 920 } 921 922 + static void acpi_cpufreq_boost_exit(void) 923 { 924 if (msrs) { 925 unregister_cpu_notifier(&boost_nb); ··· 969 acpi_cpufreq_boost_init(); 970 971 ret = cpufreq_register_driver(&acpi_cpufreq_driver); 972 + if (ret) { 973 free_acpi_perf_data(); 974 + acpi_cpufreq_boost_exit(); 975 + } 976 return ret; 977 } 978
+1 -1
drivers/devfreq/Kconfig
··· 67 68 config ARM_EXYNOS4_BUS_DEVFREQ 69 bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" 70 - depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412 71 select ARCH_HAS_OPP 72 select DEVFREQ_GOV_SIMPLE_ONDEMAND 73 help
··· 67 68 config ARM_EXYNOS4_BUS_DEVFREQ 69 bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" 70 + depends on (CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412) && !ARCH_MULTIPLATFORM 71 select ARCH_HAS_OPP 72 select DEVFREQ_GOV_SIMPLE_ONDEMAND 73 help