---

yaml --- r: 56715 b: refs/heads/master c: a5a60a2 h: refs/heads/master i: 56713: a6886df 56711: 8011601 v: v3
git-mirror · May 21, 2007 · 02b3f37 · 02b3f37
1 parent eccb38a
commit 02b3f37
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 913f11ee48edfa78b531e0db9385b640fbf9f6d7
+refs/heads/master: a5a60a2beea07c23e242ad8e7398e761935d669a
diff --git a/trunk/arch/s390/kernel/kprobes.c b/trunk/arch/s390/kernel/kprobes.c
@@ -413,7 +413,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p,
 			break;
 		}
 	}
-	BUG_ON(!orig_ret_address || (orig_ret_address == trampoline_address));
+	kretprobe_assert(ri, orig_ret_address, trampoline_address);
 	regs->psw.addr = orig_ret_address | PSW_ADDR_AMODE;
 
 	reset_current_kprobe();