Patch "arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort" has been added to the 3.14-stable tree

Patch "arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort" has been added to the 3.14-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort

to the 3.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-kvm-strict_mm_typechecks-fix-for-user_mem_abort.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 3d08c629244257473450a8ba17cb8184b91e68f8 Mon Sep 17 00:00:00 2001
From: Steve Capper <steve.capper@linaro.org>
Date: Tue, 14 Oct 2014 15:02:15 +0100
Subject: arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort

From: Steve Capper <steve.capper@linaro.org>

commit 3d08c629244257473450a8ba17cb8184b91e68f8 upstream.

Commit:
b886576 ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping

introduced some code in user_mem_abort that failed to compile if
STRICT_MM_TYPECHECKS was enabled.

This patch fixes up the failing comparison.

Signed-off-by: Steve Capper <steve.capper@linaro.org>
Reviewed-by: Kim Phillips <kim.phillips@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/arm/kvm/mmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -850,7 +850,7 @@ static int user_mem_abort(struct kvm_vcp
 		}
 		coherent_cache_guest_page(vcpu, hva, PAGE_SIZE);
 		ret = stage2_set_pte(kvm, memcache, fault_ipa, &new_pte,
-				     mem_type == PAGE_S2_DEVICE);
+			pgprot_val(mem_type) == pgprot_val(PAGE_S2_DEVICE));
 	}
 
 


Patches currently in stable-queue which might be from steve.capper@linaro.org are

queue-3.14/arm-kvm-strict_mm_typechecks-fix-for-user_mem_abort.patch