Commit 0d35e162 authored by Matthew McClintock's avatar Matthew McClintock Committed by Benjamin Herrenschmidt

powerpc/mm: Assume first cpu is boot_cpuid not 0

arch/powerpc/mm/mmu_context_nohash.c assumes the boot cpu
will always have smp_processor_id() == 0. This patch fixes
that assumption
Signed-off-by: default avatarMatthew McClintock <msm@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 86250b9d
...@@ -334,7 +334,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self, ...@@ -334,7 +334,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
/* We don't touch CPU 0 map, it's allocated at aboot and kept /* We don't touch CPU 0 map, it's allocated at aboot and kept
* around forever * around forever
*/ */
if (cpu == 0) if (cpu == boot_cpuid)
return NOTIFY_OK; return NOTIFY_OK;
switch (action) { switch (action) {
...@@ -420,9 +420,11 @@ void __init mmu_context_init(void) ...@@ -420,9 +420,11 @@ void __init mmu_context_init(void)
*/ */
context_map = alloc_bootmem(CTX_MAP_SIZE); context_map = alloc_bootmem(CTX_MAP_SIZE);
context_mm = alloc_bootmem(sizeof(void *) * (last_context + 1)); context_mm = alloc_bootmem(sizeof(void *) * (last_context + 1));
#ifndef CONFIG_SMP
stale_map[0] = alloc_bootmem(CTX_MAP_SIZE); stale_map[0] = alloc_bootmem(CTX_MAP_SIZE);
#else
stale_map[boot_cpuid] = alloc_bootmem(CTX_MAP_SIZE);
#ifdef CONFIG_SMP
register_cpu_notifier(&mmu_context_cpu_nb); register_cpu_notifier(&mmu_context_cpu_nb);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment