---

yaml --- r: 362765 b: refs/heads/master c: f752ac4 h: refs/heads/master i: 362763: 119d696 v: v3
git-mirror · Apr 17, 2013 · 12e5471 · 12e5471
1 parent 0768cc6
commit 12e5471
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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