forked from Minki/linux
645a79195f
Unlike 64bit, 32bit has been using its own cpu_to_node_map[] for CPU -> NUMA node mapping. Replace it with early_percpu variable x86_cpu_to_node_map and share the mapping code with 64bit. * USE_PERCPU_NUMA_NODE_ID is now enabled for 32bit too. * x86_cpu_to_node_map and numa_set/clear_node() are moved from numa_64 to numa. For now, on 32bit, x86_cpu_to_node_map is initialized with 0 instead of NUMA_NO_NODE. This is to avoid introducing unexpected behavior change and will be updated once init path is unified. * srat_detect_node() is now enabled for x86_32 too. It calls numa_set_node() and initializes the mapping making explicit cpu_to_node_map[] updates from map/unmap_cpu_to_node() unnecessary. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: eric.dumazet@gmail.com Cc: yinghai@kernel.org Cc: brgerst@gmail.com Cc: gorcunov@gmail.com Cc: penberg@kernel.org Cc: shaohui.zheng@intel.com Cc: rientjes@google.com LKML-Reference: <1295789862-25482-15-git-send-email-tj@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: David Rientjes <rientjes@google.com>
42 lines
1.0 KiB
C
42 lines
1.0 KiB
C
#ifndef _ASM_X86_NUMA_H
|
|
#define _ASM_X86_NUMA_H
|
|
|
|
#include <asm/apicdef.h>
|
|
|
|
#ifdef CONFIG_NUMA
|
|
/*
|
|
* __apicid_to_node[] stores the raw mapping between physical apicid and
|
|
* node and is used to initialize cpu_to_node mapping.
|
|
*
|
|
* The mapping may be overridden by apic->numa_cpu_node() on 32bit and thus
|
|
* should be accessed by the accessors - set_apicid_to_node() and
|
|
* numa_cpu_node().
|
|
*/
|
|
extern s16 __apicid_to_node[MAX_LOCAL_APIC];
|
|
|
|
static inline void set_apicid_to_node(int apicid, s16 node)
|
|
{
|
|
__apicid_to_node[apicid] = node;
|
|
}
|
|
#else /* CONFIG_NUMA */
|
|
static inline void set_apicid_to_node(int apicid, s16 node)
|
|
{
|
|
}
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#ifdef CONFIG_X86_32
|
|
# include "numa_32.h"
|
|
#else
|
|
# include "numa_64.h"
|
|
#endif
|
|
|
|
#ifdef CONFIG_NUMA
|
|
extern void __cpuinit numa_set_node(int cpu, int node);
|
|
extern void __cpuinit numa_clear_node(int cpu);
|
|
#else /* CONFIG_NUMA */
|
|
static inline void numa_set_node(int cpu, int node) { }
|
|
static inline void numa_clear_node(int cpu) { }
|
|
#endif /* CONFIG_NUMA */
|
|
|
|
#endif /* _ASM_X86_NUMA_H */
|