diff options
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 61a3f4132087..9cc5a52711e5 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
| @@ -367,7 +367,6 @@ static void __init cpu_init_thread_core_maps(int tpc) | |||
| 367 | * setup_cpu_maps - initialize the following cpu maps: | 367 | * setup_cpu_maps - initialize the following cpu maps: |
| 368 | * cpu_possible_map | 368 | * cpu_possible_map |
| 369 | * cpu_present_map | 369 | * cpu_present_map |
| 370 | * cpu_sibling_map | ||
| 371 | * | 370 | * |
| 372 | * Having the possible map set up early allows us to restrict allocations | 371 | * Having the possible map set up early allows us to restrict allocations |
| 373 | * of things like irqstacks to num_possible_cpus() rather than NR_CPUS. | 372 | * of things like irqstacks to num_possible_cpus() rather than NR_CPUS. |
| @@ -475,29 +474,6 @@ void __init smp_setup_cpu_maps(void) | |||
| 475 | */ | 474 | */ |
| 476 | cpu_init_thread_core_maps(nthreads); | 475 | cpu_init_thread_core_maps(nthreads); |
| 477 | } | 476 | } |
| 478 | |||
| 479 | /* | ||
| 480 | * Being that cpu_sibling_map is now a per_cpu array, then it cannot | ||
| 481 | * be initialized until the per_cpu areas have been created. This | ||
| 482 | * function is now called from setup_per_cpu_areas(). | ||
| 483 | */ | ||
| 484 | void __init smp_setup_cpu_sibling_map(void) | ||
| 485 | { | ||
| 486 | #ifdef CONFIG_PPC64 | ||
| 487 | int i, cpu, base; | ||
| 488 | |||
| 489 | for_each_possible_cpu(cpu) { | ||
| 490 | DBG("Sibling map for CPU %d:", cpu); | ||
| 491 | base = cpu_first_thread_in_core(cpu); | ||
| 492 | for (i = 0; i < threads_per_core; i++) { | ||
| 493 | cpu_set(base + i, per_cpu(cpu_sibling_map, cpu)); | ||
| 494 | DBG(" %d", base + i); | ||
| 495 | } | ||
| 496 | DBG("\n"); | ||
| 497 | } | ||
| 498 | |||
| 499 | #endif /* CONFIG_PPC64 */ | ||
| 500 | } | ||
| 501 | #endif /* CONFIG_SMP */ | 477 | #endif /* CONFIG_SMP */ |
| 502 | 478 | ||
| 503 | #ifdef CONFIG_PCSPKR_PLATFORM | 479 | #ifdef CONFIG_PCSPKR_PLATFORM |
