diff options
author | Tudor Laurentiu <b10716@freescale.com> | 2015-10-01 08:58:03 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2015-10-15 00:59:19 -0400 |
commit | 224f363246c3668452ec0ab5a0ff51824822f3fd (patch) | |
tree | 6cc4736cec61a6007fdc9592e72aec513000a334 | |
parent | 2daab50e17997424af57d1ab14042a51e9a368ab (diff) |
KVM: PPC: e500: fix couple of shift operations on 64 bits
Fix couple of cases where we shift left a 32-bit
value thus might get truncated results on 64-bit
targets.
Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
Suggested-by: Scott Wood <scotttwood@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kvm/e500_mmu_host.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 4d33e199edcc..5e2102c19586 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c | |||
@@ -406,7 +406,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, | |||
406 | 406 | ||
407 | for (; tsize > BOOK3E_PAGESZ_4K; tsize -= 2) { | 407 | for (; tsize > BOOK3E_PAGESZ_4K; tsize -= 2) { |
408 | unsigned long gfn_start, gfn_end; | 408 | unsigned long gfn_start, gfn_end; |
409 | tsize_pages = 1 << (tsize - 2); | 409 | tsize_pages = 1UL << (tsize - 2); |
410 | 410 | ||
411 | gfn_start = gfn & ~(tsize_pages - 1); | 411 | gfn_start = gfn & ~(tsize_pages - 1); |
412 | gfn_end = gfn_start + tsize_pages; | 412 | gfn_end = gfn_start + tsize_pages; |
@@ -447,7 +447,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, | |||
447 | } | 447 | } |
448 | 448 | ||
449 | if (likely(!pfnmap)) { | 449 | if (likely(!pfnmap)) { |
450 | tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT); | 450 | tsize_pages = 1UL << (tsize + 10 - PAGE_SHIFT); |
451 | pfn = gfn_to_pfn_memslot(slot, gfn); | 451 | pfn = gfn_to_pfn_memslot(slot, gfn); |
452 | if (is_error_noslot_pfn(pfn)) { | 452 | if (is_error_noslot_pfn(pfn)) { |
453 | if (printk_ratelimit()) | 453 | if (printk_ratelimit()) |