diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-01-04 09:03:42 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-01-04 09:03:42 +0000 |
| commit | 4cb93df41b33cf8134570c7490791f2bca31bc7a (patch) | |
| tree | 8645eb9fa3313b90ef38f3fd0cd4fc1006792e9e /xen/arch/x86/numa.c | |
| parent | c261b5cbde8869de7d86262f7344d9e29f103dec (diff) | |
| download | xen-4cb93df41b33cf8134570c7490791f2bca31bc7a.tar.gz xen-4cb93df41b33cf8134570c7490791f2bca31bc7a.tar.bz2 xen-4cb93df41b33cf8134570c7490791f2bca31bc7a.zip | |
Revert 20726:ddb8c5e798f9
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
Diffstat (limited to 'xen/arch/x86/numa.c')
| -rw-r--r-- | xen/arch/x86/numa.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 6810b484ca..676ff37001 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -35,9 +35,6 @@ u8 memnodemap[NODEMAPSIZE]; unsigned char cpu_to_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; -/* - * Keep BIOS's CPU2node information, should not be used for memory allocaion - */ unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; @@ -291,15 +288,14 @@ static __init int numa_setup(char *opt) */ void __devinit init_cpu_to_node(void) { - int i, node; + int i; for (i = 0; i < NR_CPUS; i++) { u32 apicid = x86_cpu_to_apicid[i]; if (apicid == BAD_APICID) continue; - node = apicid_to_node[apicid]; - if ( node == NUMA_NO_NODE || !node_online(node) ) - node = 0; - numa_set_node(i, node); + if (apicid_to_node[apicid] == NUMA_NO_NODE) + continue; + numa_set_node(i,apicid_to_node[apicid]); } } |