From: tip-bot for H Hartley Sweeten <hartleys@visionengravers.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
yinghai@kernel.org, hartleys@visionengravers.com, tj@kernel.org,
tglx@linutronix.de, hsweeten@visionengravers.com,
rientjes@google.com, mingo@elte.hu
Subject: [tip:x86/asm] x86: Use the same node_distance for 32 and 64-bit
Date: Wed, 7 Dec 2011 00:58:43 -0800 [thread overview]
Message-ID: <tip-79f1ddd06471b094ae30eb17b33beb9f1234ca93@git.kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.00.1112061220310.28251@chino.kir.corp.google.com>
Commit-ID: 79f1ddd06471b094ae30eb17b33beb9f1234ca93
Gitweb: http://git.kernel.org/tip/79f1ddd06471b094ae30eb17b33beb9f1234ca93
Author: H Hartley Sweeten <hartleys@visionengravers.com>
AuthorDate: Tue, 6 Dec 2011 12:22:03 -0800
Committer: Ingo Molnar <mingo@elte.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@visionengravers.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/alpine.DEB.2.00.1112061220310.28251@chino.kir.corp.google.com
Signed-off-by: Ingo Molnar <mingo@elte.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 */
next prev parent reply other threads:[~2011-12-07 8:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-19 23:03 [PATCH] x86: use " H Hartley Sweeten
2011-09-20 0:51 ` David Rientjes
2011-10-14 20:27 ` David Rientjes
2011-12-05 12:44 ` Ingo Molnar
2011-12-06 20:22 ` [patch resend] " David Rientjes
2011-12-07 8:58 ` tip-bot for H Hartley Sweeten [this message]
2011-09-24 1:45 ` [PATCH] " Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-79f1ddd06471b094ae30eb17b33beb9f1234ca93@git.kernel.org \
--to=hartleys@visionengravers.com \
--cc=hpa@zytor.com \
--cc=hsweeten@visionengravers.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=rientjes@google.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome