diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-19 17:15:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-06-19 17:15:24 +0200 |
| commit | 05fe125fa3237de2ec5bada80031e694de78909c (patch) | |
| tree | 9e8cec45a5ded37b04c92a7a94dd1eefb5259344 /arch/arm/kvm/mmu.c | |
| parent | e80a4a9426adeaa34c009bc0bc61365e0580bf01 (diff) | |
| parent | c62e631d4a8e41493c6341d8259e996ed5fc11e3 (diff) | |
| download | op-kernel-dev-05fe125fa3237de2ec5bada80031e694de78909c.zip op-kernel-dev-05fe125fa3237de2ec5bada80031e694de78909c.tar.gz | |
Merge tag 'kvm-arm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM changes for v4.2:
- Proper guest time accounting
- FP access fix for 32bit
- The usual pile of GIC fixes
- PSCI fixes
- Random cleanups
Diffstat (limited to 'arch/arm/kvm/mmu.c')
| -rw-r--r-- | arch/arm/kvm/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 7f473e6..7b42012 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -691,8 +691,8 @@ int kvm_alloc_stage2_pgd(struct kvm *kvm) * work. This is not used by the hardware and we have no * alignment requirement for this allocation. */ - pgd = (pgd_t *)kmalloc(PTRS_PER_S2_PGD * sizeof(pgd_t), - GFP_KERNEL | __GFP_ZERO); + pgd = kmalloc(PTRS_PER_S2_PGD * sizeof(pgd_t), + GFP_KERNEL | __GFP_ZERO); if (!pgd) { kvm_free_hwpgd(hwpgd); |
