x86, NUMA: Unify 32/64bit numa_cpu_node() implementation

Browse source

Currently, the only meaningful user of apic->x86_32_numa_cpu_node() is
NUMAQ which returns valid mapping only after CPU is initialized during
SMP bringup; thus, the previous patch to set apicid -> node in
setup_local_APIC() makes __apicid_to_node[] always contain the correct
mapping whether custom apic->x86_32_numa_cpu_node() is used or not.

So, there is no reason to keep separate 32bit implementation.  We can
always consult __apicid_to_node[].  Move 64bit implementation from
numa_64.c to numa.c and remove 32bit implementation from numa_32.c.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>

...

This commit is contained in:

Tejun Heo 2011-05-02 14:18:52 +02:00

parent c4b90c1199

commit 6bd262731b

6 changed files with 19 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

arch/x86/include/asm/numa.h

View file

6

arch/x86/include/asm/numa_32.h

View file

3

arch/x86/include/asm/numa_64.h

View file

9

arch/x86/mm/numa.c

View file

5

arch/x86/mm/numa_32.c

View file

9

arch/x86/mm/numa_64.c

View file