diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 14:40:08 -0400 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /arch/ia64/kernel/smpboot.c | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
| -rw-r--r-- | arch/ia64/kernel/smpboot.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index e5230b2ff2c5..6a1380e90f87 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -390,6 +390,14 @@ smp_callin (void) | |||
| 390 | 390 | ||
| 391 | fix_b0_for_bsp(); | 391 | fix_b0_for_bsp(); |
| 392 | 392 | ||
| 393 | #ifdef CONFIG_NUMA | ||
| 394 | /* | ||
| 395 | * numa_node_id() works after this. | ||
| 396 | */ | ||
| 397 | set_numa_node(cpu_to_node_map[cpuid]); | ||
| 398 | set_numa_mem(local_memory_node(cpu_to_node_map[cpuid])); | ||
| 399 | #endif | ||
| 400 | |||
| 393 | ipi_call_lock_irq(); | 401 | ipi_call_lock_irq(); |
| 394 | spin_lock(&vector_lock); | 402 | spin_lock(&vector_lock); |
| 395 | /* Setup the per cpu irq handling data structures */ | 403 | /* Setup the per cpu irq handling data structures */ |
| @@ -632,6 +640,9 @@ void __devinit smp_prepare_boot_cpu(void) | |||
| 632 | { | 640 | { |
| 633 | cpu_set(smp_processor_id(), cpu_online_map); | 641 | cpu_set(smp_processor_id(), cpu_online_map); |
| 634 | cpu_set(smp_processor_id(), cpu_callin_map); | 642 | cpu_set(smp_processor_id(), cpu_callin_map); |
| 643 | #ifdef CONFIG_NUMA | ||
| 644 | set_numa_node(cpu_to_node_map[smp_processor_id()]); | ||
| 645 | #endif | ||
| 635 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; | 646 | per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE; |
| 636 | paravirt_post_smp_prepare_boot_cpu(); | 647 | paravirt_post_smp_prepare_boot_cpu(); |
| 637 | } | 648 | } |