[PATCH] x86: use the same node_distance for 32 and 64-bit

[PATCH] x86: use the same node_distance for 32 and 64-bit

[H Hartley Sweeten]

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 */
 

Re: [PATCH] x86: use the same node_distance for 32 and 64-bit

[David Rientjes]

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 */
>  

Re: [PATCH] x86: use the same node_distance for 32 and 64-bit

[David Rientjes]

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 */
> >  

Re: [PATCH] x86: use the same node_distance for 32 and 64-bit

[Ingo Molnar]

* 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

[patch resend] x86: use the same node_distance for 32 and 64-bit

[David Rientjes]

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 */
 

[tip:x86/asm] x86: Use the same node_distance for 32 and 64-bit

[tip-bot for H Hartley Sweeten]

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 */
 

Re: [PATCH] x86: use the same node_distance for 32 and 64-bit

[Tejun Heo]

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