Messages in this thread | | | Date | Fri, 14 Oct 2011 13:27:55 -0700 (PDT) | From | David Rientjes <> | Subject | Re: [PATCH] x86: use the same node_distance for 32 and 64-bit |
| |
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 */ > >
| |