From 23f4f12580d3b4ae05a979a1b6df24c5e23616b5 Mon Sep 17 00:00:00 2001 From: Liu Yu Date: Tue, 17 Mar 2009 16:57:46 +0800 Subject: [PATCH] --- yaml --- r: 133762 b: refs/heads/master c: 046a48b35baa7c66d0d0331256ba12ca51665411 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/e500_tlb.c | 4 ++++ trunk/arch/powerpc/kvm/e500_tlb.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7b97d42d7579..a7b8e5d6518a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc35cbc85cd78213590761618a13da6a9707652c +refs/heads/master: 046a48b35baa7c66d0d0331256ba12ca51665411 diff --git a/trunk/arch/powerpc/kvm/e500_tlb.c b/trunk/arch/powerpc/kvm/e500_tlb.c index ec933209e8af..0e773fc2d5e4 100644 --- a/trunk/arch/powerpc/kvm/e500_tlb.c +++ b/trunk/arch/powerpc/kvm/e500_tlb.c @@ -99,7 +99,11 @@ static inline u32 e500_shadow_mas3_attrib(u32 mas3, int usermode) static inline u32 e500_shadow_mas2_attrib(u32 mas2, int usermode) { +#ifdef CONFIG_SMP + return (mas2 & MAS2_ATTRIB_MASK) | MAS2_M; +#else return mas2 & MAS2_ATTRIB_MASK; +#endif } /* diff --git a/trunk/arch/powerpc/kvm/e500_tlb.h b/trunk/arch/powerpc/kvm/e500_tlb.h index 4d5cc0f7d796..45b064b76906 100644 --- a/trunk/arch/powerpc/kvm/e500_tlb.h +++ b/trunk/arch/powerpc/kvm/e500_tlb.h @@ -38,7 +38,7 @@ #define E500_TLB_USER_PERM_MASK (MAS3_UX|MAS3_UR|MAS3_UW) #define E500_TLB_SUPER_PERM_MASK (MAS3_SX|MAS3_SR|MAS3_SW) #define MAS2_ATTRIB_MASK \ - (MAS2_X0 | MAS2_X1 | MAS2_W | MAS2_I | MAS2_M | MAS2_G | MAS2_E) + (MAS2_X0 | MAS2_X1) #define MAS3_ATTRIB_MASK \ (MAS3_U0 | MAS3_U1 | MAS3_U2 | MAS3_U3 \ | E500_TLB_USER_PERM_MASK | E500_TLB_SUPER_PERM_MASK)