diff --git a/kernel.spec b/kernel.spec index f6f3caea2..415f2064d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -701,6 +701,8 @@ Patch21000: arm-export-read_current_timer.patch Patch21002: arm-lpae-ax88796.patch Patch21003: drm-exynos-fix-multiple-definition-build-error.patch +Patch21004: v2-thermal-cpu_cooling-fix-stub-function.patch + # ARM tegra Patch21005: arm-tegra-usb-no-reset-linux33.patch @@ -1284,6 +1286,7 @@ ApplyPatch debug-bad-pte-modules.patch ApplyPatch arm-export-read_current_timer.patch ApplyPatch arm-lpae-ax88796.patch ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch +ApplyPatch v2-thermal-cpu_cooling-fix-stub-function.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch # @@ -2233,6 +2236,9 @@ fi # ||----w | # || || %changelog +* Sat May 11 2013 Peter Robinson +- Another patch to fix ARM kernel build + * Fri May 10 2013 Peter Robinson - Add patch to fix exynosdrm build, drop old tegra patches, minor config updates diff --git a/v2-thermal-cpu_cooling-fix-stub-function.patch b/v2-thermal-cpu_cooling-fix-stub-function.patch new file mode 100644 index 000000000..55a5e7c30 --- /dev/null +++ b/v2-thermal-cpu_cooling-fix-stub-function.patch @@ -0,0 +1,22 @@ +diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h +index 282e270..a5d52ee 100644 +--- a/include/linux/cpu_cooling.h ++++ b/include/linux/cpu_cooling.h +@@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus); + */ + void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); + +-unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int); ++unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq); + #else /* !CONFIG_CPU_THERMAL */ + static inline struct thermal_cooling_device * + cpufreq_cooling_register(const struct cpumask *clip_cpus) +@@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) + return; + } + static inline +-unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) ++unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq) + { + return THERMAL_CSTATE_INVALID; + }