Commit 4492d1a2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Rafael J. Wysocki

cpufreq: fix qoriq uniprocessor build

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 2f249358 ("cpufreq: qoriq: rename the driver")
Cc: Tang Yuantian <Yuantian.Tang@freescale.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 38fc7839
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp.h> #include <linux/smp.h>
#if !defined(CONFIG_ARM)
#include <asm/smp.h> /* for get_hard_smp_processor_id() in UP configs */ #include <asm/smp.h> /* for get_hard_smp_processor_id() in UP configs */
#endif
/** /**
* struct cpu_data * struct cpu_data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment