* [PATCH] cpufreq: fix qoriq uniprocessor build
@ 2015-04-10 22:17 Arnd Bergmann
2015-04-11 3:02 ` Viresh Kumar
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2015-04-10 22:17 UTC (permalink / raw)
To: linux-arm-kernel
The qoriq-cpufreq driver contains a hack for powerpc to include
asm/smp.h on uniprocessor builds so it can get the hardware CPU
number. On ARM, it does not require this hack, but instead gets
a compile error:
In file included from drivers/cpufreq/qoriq-cpufreq.c:24:0:
arch/arm/include/asm/smp.h:18:3: error: #error "<asm/smp.h> included in non-SMP build"
arch/arm/include/asm/smp.h:21:0: warning: "raw_smp_processor_id" redefined
This adds an #ifdef to mirror the one in its get_cpu_physical_id()
function.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 2f249358eedaf ("cpufreq: qoriq: rename the driver")
Cc: Tang Yuantian <Yuantian.Tang@freescale.com>
diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
index 9fd51c860308..88b21ae0d6b0 100644
--- a/drivers/cpufreq/qoriq-cpufreq.c
+++ b/drivers/cpufreq/qoriq-cpufreq.c
@@ -21,7 +21,9 @@
#include <linux/slab.h>
#include <linux/smp.h>
+#if !defined(CONFIG_ARM)
#include <asm/smp.h> /* for get_hard_smp_processor_id() in UP configs */
+#endif
/**
* struct cpu_data
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] cpufreq: fix qoriq uniprocessor build
2015-04-10 22:17 [PATCH] cpufreq: fix qoriq uniprocessor build Arnd Bergmann
@ 2015-04-11 3:02 ` Viresh Kumar
0 siblings, 0 replies; 2+ messages in thread
From: Viresh Kumar @ 2015-04-11 3:02 UTC (permalink / raw)
To: linux-arm-kernel
On 11 April 2015 at 03:47, Arnd Bergmann <arnd@arndb.de> wrote:
> The qoriq-cpufreq driver contains a hack for powerpc to include
> asm/smp.h on uniprocessor builds so it can get the hardware CPU
> number. On ARM, it does not require this hack, but instead gets
> a compile error:
>
> In file included from drivers/cpufreq/qoriq-cpufreq.c:24:0:
> arch/arm/include/asm/smp.h:18:3: error: #error "<asm/smp.h> included in non-SMP build"
> arch/arm/include/asm/smp.h:21:0: warning: "raw_smp_processor_id" redefined
>
> This adds an #ifdef to mirror the one in its get_cpu_physical_id()
> function.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 2f249358eedaf ("cpufreq: qoriq: rename the driver")
> Cc: Tang Yuantian <Yuantian.Tang@freescale.com>
>
> diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c
> index 9fd51c860308..88b21ae0d6b0 100644
> --- a/drivers/cpufreq/qoriq-cpufreq.c
> +++ b/drivers/cpufreq/qoriq-cpufreq.c
> @@ -21,7 +21,9 @@
> #include <linux/slab.h>
> #include <linux/smp.h>
>
> +#if !defined(CONFIG_ARM)
> #include <asm/smp.h> /* for get_hard_smp_processor_id() in UP configs */
> +#endif
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-11 3:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-10 22:17 [PATCH] cpufreq: fix qoriq uniprocessor build Arnd Bergmann
2015-04-11 3:02 ` Viresh Kumar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).