31 lines
947 B
Diff
31 lines
947 B
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Wed, 01 Feb 2017 22:45:06 +0000
|
|
Subject: 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>
|
|
---
|
|
--- 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])
|