From 0bd12ba1d4216f7fcfbcf08c043e4e4a004ac7c1 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Sat, 29 Oct 2005 18:16:37 -0700 Subject: [PATCH] --- yaml --- r: 11371 b: refs/heads/master c: a7e4705b24e611574e5c23105005ffdff694fd58 h: refs/heads/master i: 11369: 0a759e014e91e43850aebc68ccbd3efc15705a2d 11367: 7a75d58737ae4ac9e0e3978b146bee25a2b715af v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v32/mm/tlb.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ce1ecbf252d0..a8a2a4049e0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92dc6fcc845d99e87d8168e0786796525832d130 +refs/heads/master: a7e4705b24e611574e5c23105005ffdff694fd58 diff --git a/trunk/arch/cris/arch-v32/mm/tlb.c b/trunk/arch/cris/arch-v32/mm/tlb.c index 8233406798d3..b08a28bb58ab 100644 --- a/trunk/arch/cris/arch-v32/mm/tlb.c +++ b/trunk/arch/cris/arch-v32/mm/tlb.c @@ -175,6 +175,8 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm) 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 mm_struct *next, 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