---

yaml --- r: 297067 b: refs/heads/master c: 90b92a6 h: refs/heads/master i: 297065: 89542dc 297063: d02e495 v: v3
git-mirror · Mar 5, 2012 · d88b6f2 · d88b6f2
1 parent aefeb53
commit d88b6f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf3cdcc148abcd0e9d398393d390ff136d6eb9a
+refs/heads/master: 90b92a6f51af9adf8c44e8ab3f435b336e5ba6ff
diff --git a/trunk/arch/powerpc/kvm/e500_tlb.c b/trunk/arch/powerpc/kvm/e500_tlb.c
@@ -116,13 +116,11 @@ static inline int local_sid_lookup(struct id *entry)
 	return -1;
 }
 
-/* Invalidate all id mappings on local core */
+/* Invalidate all id mappings on local core -- call with preempt disabled */
 static inline void local_sid_destroy_all(void)
 {
-	preempt_disable();
 	__get_cpu_var(pcpu_last_used_sid) = 0;
 	memset(&__get_cpu_var(pcpu_sids), 0, sizeof(__get_cpu_var(pcpu_sids)));
-	preempt_enable();
 }
 
 static void *kvmppc_e500_id_table_alloc(struct kvmppc_vcpu_e500 *vcpu_e500)