* [PATCH] x86: use the same node_distance for 32 and 64-bit
@ 2011-09-19 23:03 H Hartley Sweeten
2011-09-20 0:51 ` David Rientjes
2011-09-24 1:45 ` [PATCH] x86: use " Tejun Heo
0 siblings, 2 replies; 7+ messages in thread
From: H Hartley Sweeten @ 2011-09-19 23:03 UTC (permalink / raw)
To: Linux Kernel; +Cc: x86, tglx, mingo, hpa, tj, yinghai
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>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
---
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 */
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] x86: use the same node_distance for 32 and 64-bit
2011-09-19 23:03 [PATCH] x86: use the same node_distance for 32 and 64-bit H Hartley Sweeten
@ 2011-09-20 0:51 ` David Rientjes
2011-10-14 20:27 ` David Rientjes
2011-09-24 1:45 ` [PATCH] x86: use " Tejun Heo
1 sibling, 1 reply; 7+ messages in thread
From: David Rientjes @ 2011-09-20 0:51 UTC (permalink / raw)
To: H Hartley Sweeten, Tejun Heo
Cc: linux-kernel, x86, tglx, Ingo Molnar, H. Peter Anvin, Yinghai Lu
On Mon, 19 Sep 2011, H Hartley Sweeten wrote:
> 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>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Yinghai Lu <yinghai@kernel.org>
[ I think kernel.org emails are still down, so I sent this to
htejun@gmail.com instead. ]
Acked-by: David Rientjes <rientjes@google.com>
> ---
> 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 */
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86: use the same node_distance for 32 and 64-bit
2011-09-19 23:03 [PATCH] x86: use the same node_distance for 32 and 64-bit H Hartley Sweeten
2011-09-20 0:51 ` David Rientjes
@ 2011-09-24 1:45 ` Tejun Heo
1 sibling, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2011-09-24 1:45 UTC (permalink / raw)
To: H Hartley Sweeten; +Cc: Linux Kernel, x86, tglx, mingo, hpa, yinghai
On Mon, Sep 19, 2011 at 04:03:14PM -0700, H Hartley Sweeten wrote:
> 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>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Tejun Heo <tj@kernel.org>
> Cc: Yinghai Lu <yinghai@kernel.org>
Acked-by: Tejun Heo <tj@kernel.org>
Thank you.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86: use the same node_distance for 32 and 64-bit
2011-09-20 0:51 ` David Rientjes
@ 2011-10-14 20:27 ` David Rientjes
2011-12-05 12:44 ` Ingo Molnar
0 siblings, 1 reply; 7+ messages in thread
From: David Rientjes @ 2011-10-14 20:27 UTC (permalink / raw)
To: tglx, Ingo Molnar, H. Peter Anvin
Cc: H Hartley Sweeten, linux-kernel, x86, Yinghai Lu, Tejun Heo
On Mon, 19 Sep 2011, David Rientjes wrote:
> On Mon, 19 Sep 2011, H Hartley Sweeten wrote:
>
> > 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>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: Tejun Heo <tj@kernel.org>
> > Cc: Yinghai Lu <yinghai@kernel.org>
>
> [ I think kernel.org emails are still down, so I sent this to
> htejun@gmail.com instead. ]
>
> Acked-by: David Rientjes <rientjes@google.com>
>
Ingo, Peter, I don't think this was merged into any x86 tree yet (and I
gave up trying to figure it out, cloning from tesla.tglx.de was going
about 2kB/sec).
It was also acked by Tejun Heo <tj@kernel.org> during review.
> > ---
> > 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 */
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] x86: use the same node_distance for 32 and 64-bit
2011-10-14 20:27 ` David Rientjes
@ 2011-12-05 12:44 ` Ingo Molnar
2011-12-06 20:22 ` [patch resend] " David Rientjes
0 siblings, 1 reply; 7+ messages in thread
From: Ingo Molnar @ 2011-12-05 12:44 UTC (permalink / raw)
To: David Rientjes
Cc: tglx, Ingo Molnar, H. Peter Anvin, H Hartley Sweeten,
linux-kernel, x86, Yinghai Lu, Tejun Heo
* David Rientjes <rientjes@google.com> wrote:
> On Mon, 19 Sep 2011, David Rientjes wrote:
>
> > On Mon, 19 Sep 2011, H Hartley Sweeten wrote:
> >
> > > 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>
> > > Cc: Thomas Gleixner <tglx@linutronix.de>
> > > Cc: Ingo Molnar <mingo@redhat.com>
> > > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > > Cc: Tejun Heo <tj@kernel.org>
> > > Cc: Yinghai Lu <yinghai@kernel.org>
> >
> > [ I think kernel.org emails are still down, so I sent this to
> > htejun@gmail.com instead. ]
> >
> > Acked-by: David Rientjes <rientjes@google.com>
> >
>
> Ingo, Peter, I don't think this was merged into any x86 tree
> yet (and I gave up trying to figure it out, cloning from
> tesla.tglx.de was going about 2kB/sec).
>
> It was also acked by Tejun Heo <tj@kernel.org> during review.
No objections, could someone please resend it with all acks in
place, and with maintainers Cc:-ed? I don't have the original
mail in any of my folders.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 7+ messages in thread
* [patch resend] x86: use the same node_distance for 32 and 64-bit
2011-12-05 12:44 ` Ingo Molnar
@ 2011-12-06 20:22 ` David Rientjes
2011-12-07 8:58 ` [tip:x86/asm] x86: Use " tip-bot for H Hartley Sweeten
0 siblings, 1 reply; 7+ messages in thread
From: David Rientjes @ 2011-12-06 20:22 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, tglx
Cc: H Hartley Sweeten, linux-kernel, x86, Yinghai Lu, Tejun Heo
From: H Hartley Sweeten <hartleys@visionengravers.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@kernel.org>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: David Rientjes <rientjes@google.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 */
^ permalink raw reply [flat|nested] 7+ messages in thread
* [tip:x86/asm] x86: Use the same node_distance for 32 and 64-bit
2011-12-06 20:22 ` [patch resend] " David Rientjes
@ 2011-12-07 8:58 ` tip-bot for H Hartley Sweeten
0 siblings, 0 replies; 7+ messages in thread
From: tip-bot for H Hartley Sweeten @ 2011-12-07 8:58 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, yinghai, hartleys, tj, tglx, hsweeten,
rientjes, mingo
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 */
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-12-07 8:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-19 23:03 [PATCH] x86: use the same node_distance for 32 and 64-bit 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:x86/asm] x86: Use " tip-bot for H Hartley Sweeten
2011-09-24 1:45 ` [PATCH] x86: use " Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).