On Tue, Jun 02, 2015 at 10:48:06PM +0800, shannon.zhao@xxxxxxxxxx wrote: > From: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > > commit a7d079cea2dffb112e26da2566dd84c0ef1fce97 upstream. > > The ISS encoding for an exception from a Data Abort has a WnR > bit[6] that indicates whether the Data Abort was caused by a > read or a write instruction. While there are several fields > in the encoding that are only valid if the ISV bit[24] is set, > WnR is not one of them, so we can read it unconditionally. > > Instead of fixing both implementations of kvm_is_write_fault() > in place, reimplement it just once using kvm_vcpu_dabt_iswrite(), > which already does the right thing with respect to the WnR bit. > Also fix up the callers to pass 'vcpu' > > Acked-by: Laszlo Ersek <lersek@xxxxxxxxxx> > Acked-by: Marc Zyngier <marc.zyngier@xxxxxxx> > Acked-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> > Signed-off-by: Shannon Zhao <shannon.zhao@xxxxxxxxxx> > --- > arch/arm/include/asm/kvm_mmu.h | 11 ----------- > arch/arm/kvm/mmu.c | 10 +++++++++- > arch/arm64/include/asm/kvm_mmu.h | 13 ------------- > 3 files changed, 9 insertions(+), 25 deletions(-) Please always say that you modified the code from the original version, and _why_ you did such a modification. Otherwise I'll assume you did this backport wrong and throw it out. Like I'm doing now :) Please fix up and resend all of the remaining of the series you wish to see added to 3.14-stable. thanks, gre k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html