diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 12:09:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 12:09:32 -0700 |
| commit | 60a0cd528d761c50d3a0a49e8fbaf6a87e64254a (patch) | |
| tree | 4eca8970064738311f602c1fb606ecb2520a4e68 | |
| parent | e25e0920b5f0f2d46d16f14f7f51ccbfd0773671 (diff) | |
| parent | 8e35961b57da14cb64cb0e4e1b7e3aabda6396fe (diff) | |
| download | op-kernel-dev-60a0cd528d761c50d3a0a49e8fbaf6a87e64254a.zip op-kernel-dev-60a0cd528d761c50d3a0a49e8fbaf6a87e64254a.tar.gz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix broken MMU PID stealing on !SMP
| -rw-r--r-- | arch/powerpc/mm/mmu_context_nohash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c index a70e311..030d000 100644 --- a/arch/powerpc/mm/mmu_context_nohash.c +++ b/arch/powerpc/mm/mmu_context_nohash.c @@ -127,12 +127,12 @@ static unsigned int steal_context_up(unsigned int id) pr_debug("[%d] steal context %d from mm @%p\n", cpu, id, mm); - /* Mark this mm has having no context anymore */ - mm->context.id = MMU_NO_CONTEXT; - /* Flush the TLB for that context */ local_flush_tlb_mm(mm); + /* Mark this mm has having no context anymore */ + mm->context.id = MMU_NO_CONTEXT; + /* XXX This clear should ultimately be part of local_flush_tlb_mm */ __clear_bit(id, stale_map[cpu]); |
