Skip to content

Commit

Permalink
powerpc/mm: Assume first cpu is boot_cpuid not 0
Browse files Browse the repository at this point in the history
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: Matthew McClintock <msm@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Matthew McClintock authored and Benjamin Herrenschmidt committed Sep 2, 2010
1 parent 86250b9 commit 0d35e16
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/mm/mmu_context_nohash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* around forever
*/
if (cpu == 0)
if (cpu == boot_cpuid)
return NOTIFY_OK;

switch (action) {
Expand Down Expand Up @@ -420,9 +420,11 @@ void __init mmu_context_init(void)
*/
context_map = alloc_bootmem(CTX_MAP_SIZE);
context_mm = alloc_bootmem(sizeof(void *) * (last_context + 1));
#ifndef CONFIG_SMP
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);
#endif

Expand Down

0 comments on commit 0d35e16

Please sign in to comment.