diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-02-04 16:32:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-23 08:21:45 -0800 |
| commit | fc5e8c283999168942baa5ef7f3805444f80be2b (patch) | |
| tree | cb72b229751f6c9420bd6bf9a315500a1a9dbd37 /arch/sparc | |
| parent | cbc41b43e7c2ba6503b6b96dfe38e6b1316f46cf (diff) | |
| download | talos-obmc-linux-fc5e8c283999168942baa5ef7f3805444f80be2b.tar.gz talos-obmc-linux-fc5e8c283999168942baa5ef7f3805444f80be2b.zip | |
sparc: topology_64.h: Fix condition for including cpudata.h
We currently define macros referring to cpu_data if CONFIG_SMP is
defined, but only include the declaration if CONFIG_NUMA is defined.
Fixes: 541cc39433a8 ("sparc: fix a building error reported by kbuild")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/topology_64.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 225543000122..ad5293f89680 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@ -4,7 +4,6 @@ #ifdef CONFIG_NUMA #include <asm/mmzone.h> -#include <asm/cpudata.h> static inline int cpu_to_node(int cpu) { @@ -42,6 +41,9 @@ int __node_distance(int, int); #endif /* !(CONFIG_NUMA) */ #ifdef CONFIG_SMP + +#include <asm/cpudata.h> + #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) #define topology_core_id(cpu) (cpu_data(cpu).core_id) #define topology_core_cpumask(cpu) (&cpu_core_sib_map[cpu]) |
