[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1112061220310.28251@chino.kir.corp.google.com>
Date: Tue, 6 Dec 2011 12:22:03 -0800 (PST)
From: David Rientjes <rientjes@...gle.com>
To: Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
tglx@...utronix.de
cc: H Hartley Sweeten <hartleys@...ionengravers.com>,
linux-kernel@...r.kernel.org, x86@...nel.org,
Yinghai Lu <yinghai@...nel.org>, Tejun Heo <tj@...nel.org>
Subject: [patch resend] x86: use the same node_distance for 32 and 64-bit
From: H Hartley Sweeten <hartleys@...ionengravers.com>
The node_distance function is not x86 64-bit specific. Having the #ifdef
around the extern function declaration and the #define causes the default
node_distance macro to be used in asm-generic/topology.h. This also causes
a sparse warning in arch/x86/mm/numa.c when CONFIG_X86_64 is not set:
warning: symbol '__node_distance' was not declared. Should it be static?
Remove the #ifdef to fix both issues.
Cc: Yinghai Lu <yinghai@...nel.org>
Acked-by: Tejun Heo <tj@...nel.org>
Signed-off-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
Signed-off-by: David Rientjes <rientjes@...gle.com>
---
arch/x86/include/asm/topology.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -130,10 +130,8 @@ extern void setup_node_to_cpumask_map(void);
.balance_interval = 1, \
}
-#ifdef CONFIG_X86_64
extern int __node_distance(int, int);
#define node_distance(a, b) __node_distance(a, b)
-#endif
#else /* !CONFIG_NUMA */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists