From d88b6f20f2087294e5ab9ffdb6231802b9a6da20 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Thu, 18 Aug 2011 15:25:16 -0500 Subject: [PATCH] --- yaml --- r: 297067 b: refs/heads/master c: 90b92a6f51af9adf8c44e8ab3f435b336e5ba6ff h: refs/heads/master i: 297065: 89542dc9c54039f1170ef6114fcd4d4f2f87646a 297063: d02e495aa58db9747e01d107028e3fc5e6c2bfdd v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/e500_tlb.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 10ff712d07bd..279a2d4afdd4 100644 --- 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 index 22624a7ae821..b976d8025e58 100644 --- 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)