From eeb2fb00df54c06c0c05462651bfcd6430ca8024 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:09 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Ignore length of 0 in kvm_flush_dcache_to_poc()" This reverts commit 3b0c9ad7c7c4a3a786870426e1f64e4eb60b9f63. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I0c8e335994c7c7a8cfe29bfef20d624362b03aec --- arch/arm64/include/asm/kvm_mmu.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 7a8dc3f343ec..0c2589513be3 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -182,13 +182,8 @@ static inline void *__kvm_vector_slot2addr(void *base, struct kvm; -#define kvm_flush_dcache_to_poc(a, l) do { \ - unsigned long __a = (unsigned long)(a); \ - unsigned long __l = (unsigned long)(l); \ - \ - if (__l) \ - dcache_clean_inval_poc(__a, __a + __l); \ -} while (0) +#define kvm_flush_dcache_to_poc(a,l) \ + dcache_clean_inval_poc((unsigned long)(a), (unsigned long)(a)+(l)) static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu) {