From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:44380 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750984AbbGASXc (ORCPT ); Wed, 1 Jul 2015 14:23:32 -0400 Subject: Patch "arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort" has been added to the 3.14-stable tree To: steve.capper@linaro.org, christoffer.dall@linaro.org, gregkh@linuxfoundation.org, kim.phillips@linaro.org, shannon.zhao@linaro.org Cc: , From: Date: Wed, 01 Jul 2015 11:23:31 -0700 Message-ID: <14357750117886@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From 3d08c629244257473450a8ba17cb8184b91e68f8 Mon Sep 17 00:00:00 2001 From: Steve Capper Date: Tue, 14 Oct 2014 15:02:15 +0100 Subject: arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort From: Steve Capper 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 Reviewed-by: Kim Phillips Signed-off-by: Christoffer Dall Signed-off-by: Shannon Zhao Signed-off-by: Greg Kroah-Hartman --- 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