[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-79f1ddd06471b094ae30eb17b33beb9f1234ca93@git.kernel.org>
Date: Wed, 7 Dec 2011 00:58:43 -0800
From: tip-bot for H Hartley Sweeten <hartleys@...ionengravers.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, hartleys@...ionengravers.com, tj@...nel.org,
tglx@...utronix.de, hsweeten@...ionengravers.com,
rientjes@...gle.com, mingo@...e.hu
Subject: [tip:x86/asm] x86: Use the same node_distance for 32 and 64-bit
Commit-ID: 79f1ddd06471b094ae30eb17b33beb9f1234ca93
Gitweb: http://git.kernel.org/tip/79f1ddd06471b094ae30eb17b33beb9f1234ca93
Author: H Hartley Sweeten <hartleys@...ionengravers.com>
AuthorDate: Tue, 6 Dec 2011 12:22:03 -0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 7 Dec 2011 09:19:10 +0100
x86: Use the same node_distance for 32 and 64-bit
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.
Signed-off-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
Signed-off-by: David Rientjes <rientjes@...gle.com>
Acked-by: Tejun Heo <tj@...nel.org>
Cc: Yinghai Lu <yinghai@...nel.org>
Link: http://lkml.kernel.org/r/alpine.DEB.2.00.1112061220310.28251@chino.kir.corp.google.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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
index c006924..800f77c 100644
--- 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