From: Mike Travis <travis@sgi.com>
Date: Thu, 15 Jan 2009 17:19:32 +0000 (-0800)
Subject: x86: fix build warning when CONFIG_NUMA not defined.
X-Git-Tag: firefly_0821_release~14578^2~6^2~20^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2a082711905312dc7b6675e913fee0c4689f7ae;p=firefly-linux-kernel-4.4.55.git

x86: fix build warning when CONFIG_NUMA not defined.

Impact: fix build warning

The macro cpu_to_node did not reference it's argument, and instead
simply returned a 0.  This causes a "unused variable" warning if
it's the only reference in a function (show_cache_disable).

Replace it with the more correct inline function.

Signed-off-by: Mike Travis <travis@sgi.com>
---

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 4e2f2e0aab27..d0c68e291635 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -192,9 +192,20 @@ extern int __node_distance(int, int);
 
 #else /* !CONFIG_NUMA */
 
-#define numa_node_id()		0
-#define	cpu_to_node(cpu)	0
-#define	early_cpu_to_node(cpu)	0
+static inline int numa_node_id(void)
+{
+	return 0;
+}
+
+static inline int cpu_to_node(int cpu)
+{
+	return 0;
+}
+
+static inline int early_cpu_to_node(int cpu)
+{
+	return 0;
+}
 
 static inline const cpumask_t *cpumask_of_node(int node)
 {