From: Greg Kroah-Hartman Date: Mon, 27 Aug 2012 18:09:20 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.5.4~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85db14ee386c8ae557699a7cff08a7e1259871cc;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: arm-imx-select-cpu_freq_table-when-needed.patch --- diff --git a/queue-3.0/arm-imx-select-cpu_freq_table-when-needed.patch b/queue-3.0/arm-imx-select-cpu_freq_table-when-needed.patch new file mode 100644 index 00000000000..22de7512ec5 --- /dev/null +++ b/queue-3.0/arm-imx-select-cpu_freq_table-when-needed.patch @@ -0,0 +1,46 @@ +From f637c4c9405e21f44cf0045eaf77eddd3a79ca5a Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Thu, 16 Aug 2012 10:40:40 +0000 +Subject: ARM: imx: select CPU_FREQ_TABLE when needed + +From: Arnd Bergmann + +commit f637c4c9405e21f44cf0045eaf77eddd3a79ca5a upstream. + +The i.MX cpufreq implementation uses the CPU_FREQ_TABLE helpers, +so it needs to select that code to be built. This problem has +apparently existed since the i.MX cpufreq code was first merged +in v2.6.37. + +Building IMX without CPU_FREQ_TABLE results in: + +arch/arm/plat-mxc/built-in.o: In function `mxc_cpufreq_exit': +arch/arm/plat-mxc/cpufreq.c:173: undefined reference to `cpufreq_frequency_table_put_attr' +arch/arm/plat-mxc/built-in.o: In function `mxc_set_target': +arch/arm/plat-mxc/cpufreq.c:84: undefined reference to `cpufreq_frequency_table_target' +arch/arm/plat-mxc/built-in.o: In function `mxc_verify_speed': +arch/arm/plat-mxc/cpufreq.c:65: undefined reference to `cpufreq_frequency_table_verify' +arch/arm/plat-mxc/built-in.o: In function `mxc_cpufreq_init': +arch/arm/plat-mxc/cpufreq.c:154: undefined reference to `cpufreq_frequency_table_cpuinfo' +arch/arm/plat-mxc/cpufreq.c:162: undefined reference to `cpufreq_frequency_table_get_attr' + +Signed-off-by: Arnd Bergmann +Acked-by: Shawn Guo +Cc: Sascha Hauer +Cc: Yong Shen +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -1875,6 +1875,7 @@ source "drivers/cpufreq/Kconfig" + config CPU_FREQ_IMX + tristate "CPUfreq driver for i.MX CPUs" + depends on ARCH_MXC && CPU_FREQ ++ select CPU_FREQ_TABLE + help + This enables the CPUfreq driver for i.MX CPUs. + diff --git a/queue-3.0/series b/queue-3.0/series index ddac580dde1..68496c1a90d 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -5,3 +5,4 @@ arm-7487-1-mm-avoid-setting-ng-bit-for-user-mappings-that-aren-t-present.patch arm-7488-1-mm-use-5-bits-for-swapfile-type-encoding.patch arm-7489-1-errata-fix-workaround-for-erratum-720789-on-up-systems.patch arm-s3c24xx-fix-s3c2410_dma_enqueue-parameters.patch +arm-imx-select-cpu_freq_table-when-needed.patch