From: Hugh Dickins The cris v32 switch_mm guards get_mmu_context with next->page_table_lock: good it's not really SMP yet, since get_mmu_context messes with global variables affecting other mms. Replace by global mmu_context_lock. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton --- arch/cris/arch-v32/mm/tlb.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff -puN arch/cris/arch-v32/mm/tlb.c~mm-cris-v32-mmu_context_lock arch/cris/arch-v32/mm/tlb.c --- devel/arch/cris/arch-v32/mm/tlb.c~mm-cris-v32-mmu_context_lock 2005-10-23 14:28:10.000000000 -0700 +++ devel-akpm/arch/cris/arch-v32/mm/tlb.c 2005-10-23 14:28:10.000000000 -0700 @@ -175,6 +175,8 @@ init_new_context(struct task_struct *tsk return 0; } +static DEFINE_SPINLOCK(mmu_context_lock); + /* Called in schedule() just before actually doing the switch_to. */ void switch_mm(struct mm_struct *prev, struct mm_struct *next, @@ -183,10 +185,10 @@ switch_mm(struct mm_struct *prev, struct int cpu = smp_processor_id(); /* Make sure there is a MMU context. */ - spin_lock(&next->page_table_lock); + spin_lock(&mmu_context_lock); get_mmu_context(next); cpu_set(cpu, next->cpu_vm_mask); - spin_unlock(&next->page_table_lock); + spin_unlock(&mmu_context_lock); /* * Remember the pgd for the fault handlers. Keep a seperate copy of it _