diff options
| author | Liu Yu <yu.liu@freescale.com> | 2009-06-05 10:54:29 +0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-09-10 09:32:47 +0400 |
| commit | 0cfb50e50dd27539fed9ba3cb33b0f22c0cddef0 (patch) | |
| tree | 9b1170a860de72d4995d9af287f8c34e4baeb58a /arch/powerpc/kvm/e500_tlb.h | |
| parent | 105f8d40a737564100dc7dcd1d94d4e15fada20e (diff) | |
| download | linux-0cfb50e50dd27539fed9ba3cb33b0f22c0cddef0.tar.xz | |
KVM: ppc: e500: Move to Book-3e MMU definitions
According to commit 70fe3af8403f85196bb74f22ce4813db7dfedc1a.
Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/e500_tlb.h')
| -rw-r--r-- | arch/powerpc/kvm/e500_tlb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kvm/e500_tlb.h b/arch/powerpc/kvm/e500_tlb.h index 45b064b76906..d28e3010a5e2 100644 --- a/arch/powerpc/kvm/e500_tlb.h +++ b/arch/powerpc/kvm/e500_tlb.h @@ -16,7 +16,7 @@ #define __KVM_E500_TLB_H__ #include <linux/kvm_host.h> -#include <asm/mmu-fsl-booke.h> +#include <asm/mmu-book3e.h> #include <asm/tlb.h> #include <asm/kvm_e500.h> @@ -59,7 +59,7 @@ extern void kvmppc_e500_tlb_setup(struct kvmppc_vcpu_e500 *); /* TLB helper functions */ static inline unsigned int get_tlb_size(const struct tlbe *tlbe) { - return (tlbe->mas1 >> 8) & 0xf; + return (tlbe->mas1 >> 7) & 0x1f; } static inline gva_t get_tlb_eaddr(const struct tlbe *tlbe) @@ -70,7 +70,7 @@ static inline gva_t get_tlb_eaddr(const struct tlbe *tlbe) static inline u64 get_tlb_bytes(const struct tlbe *tlbe) { unsigned int pgsize = get_tlb_size(tlbe); - return 1ULL << 10 << (pgsize << 1); + return 1ULL << 10 << pgsize; } static inline gva_t get_tlb_end(const struct tlbe *tlbe) |