Skip to contentSkip to conversation

KVM: PPC: e500: fix couple of shift operations on 64 bits

PATCH Applied Laurentiu Tudor 3 participants 3 messages Oct 1, 2015 – Oct 15, 2015

Subsystems (3)
KVM PowerPC KVM PowerPC
lore
Share & tools
lore

Laurentiu Tudor

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Suggested-by Scott Wood <[email protected]>
---
 arch/powerpc/kvm/e500_mmu_host.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/e500_mmu_host.c +2 -2
index 008ab84..a096cf9 100644
@@ -418,7 +418,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
 			for (; tsize > BOOK3E_PAGESZ_4K;
 			     tsize -= tsize_inc) {
 				unsigned long gfn_start, gfn_end;
-				tsize_pages = 1 << (tsize - 2);
+				tsize_pages = 1UL << (tsize - 2);
 
 				gfn_start = gfn & ~(tsize_pages - 1);
 				gfn_end = gfn_start + tsize_pages;

@@ -462,7 +462,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
 	}
 
 	if (likely(!pfnmap)) {
-		tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT);
+		tsize_pages = 1UL << (tsize + 10 - PAGE_SHIFT);
 		pfn = gfn_to_pfn_memslot(slot, gfn);
 		if (is_error_noslot_pfn(pfn)) {
 			if (printk_ratelimit())
Signature · 1 line
1.8.3.1