Commit fc5e8c28 authored Feb 04, 2017 by Ben Hutchings Committed by David S. Miller Feb 23, 2017

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: 541cc394 ("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>

parent cbc41b43

arch/sparc/include/asm/topology_64.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -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])