From 12e5471303acff29977251e069eb3ccabc60f7dc Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Tue, 16 Apr 2013 13:25:06 +0200 Subject: [PATCH] --- yaml --- r: 362765 b: refs/heads/master c: f752ac4d7d96159776b0eea47489796bd90856fd h: refs/heads/master i: 362763: 119d696508f80986012289d8354d6f5bafdf4fee v: v3 --- [refs] | 2 +- trunk/arch/s390/mm/fault.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c77bfd396fbc..1db0b1886a2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b66ac63e20b3f4d7931e67c986956aa5ffbea57f +refs/heads/master: f752ac4d7d96159776b0eea47489796bd90856fd diff --git a/trunk/arch/s390/mm/fault.c b/trunk/arch/s390/mm/fault.c index 2fb9e63b8fc4..047c3e4c59a2 100644 --- a/trunk/arch/s390/mm/fault.c +++ b/trunk/arch/s390/mm/fault.c @@ -395,8 +395,13 @@ void __kprobes do_protection_exception(struct pt_regs *regs) int fault; trans_exc_code = regs->int_parm_long; - /* Protection exception is suppressing, decrement psw address. */ - regs->psw.addr = __rewind_psw(regs->psw, regs->int_code >> 16); + /* + * Protection exceptions are suppressing, decrement psw address. + * The exception to this rule are aborted transactions, for these + * the PSW already points to the correct location. + */ + if (!(regs->int_code & 0x200)) + regs->psw.addr = __rewind_psw(regs->psw, regs->int_code >> 16); /* * Check for low-address protection. This needs to be treated * as a special case because the translation exception code