From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Wed, 17 Sep 2014 21:56:16 +0000 (-0700)
Subject: arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9e8578b6cdfba0259e99e79f0cb80c55c99b3c2;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages

Pass __GFP_ZERO to __get_free_pages() instead of calling memset()
explicitly.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index eea03069161b..8f0c7a4c49fc 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -528,11 +528,10 @@ int kvm_alloc_stage2_pgd(struct kvm *kvm)
 		return -EINVAL;
 	}
 
-	pgd = (pgd_t *)__get_free_pages(GFP_KERNEL, S2_PGD_ORDER);
+	pgd = (pgd_t *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, S2_PGD_ORDER);
 	if (!pgd)
 		return -ENOMEM;
 
-	memset(pgd, 0, PTRS_PER_S2_PGD * sizeof(pgd_t));
 	kvm_clean_pgd(pgd);
 	kvm->arch.pgd = pgd;