---

yaml --- r: 204686 b: refs/heads/master c: 76b0f13 h: refs/heads/master v: v3
git-mirror · Jun 23, 2010 · 7932500 · 7932500
1 parent e78cb5e
commit 7932500
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 574cb24899d35e71be1d8fb1add2c3306804e4bf
+refs/heads/master: 76b0f1337690d223811c852ad3a5078eb89276c5
diff --git a/trunk/arch/powerpc/kernel/hw_breakpoint.c b/trunk/arch/powerpc/kernel/hw_breakpoint.c
@@ -304,15 +304,16 @@ int __kprobes single_step_dabr_instruction(struct die_args *args)
 	if (!bp_info->extraneous_interrupt)
 		perf_bp_event(bp, regs);
 
+	set_dabr(bp_info->address | bp_info->type | DABR_TRANSLATION);
+	current->thread.last_hit_ubp = NULL;
+
 	/*
-	 * Do not disable MSR_SE if the process was already in
-	 * single-stepping mode.
+	 * If the process was being single-stepped by ptrace, let the
+	 * other single-step actions occur (e.g. generate SIGTRAP).
 	 */
-	if (!test_thread_flag(TIF_SINGLESTEP))
-		regs->msr &= ~MSR_SE;
+	if (test_thread_flag(TIF_SINGLESTEP))
+		return NOTIFY_DONE;
 
-	set_dabr(bp_info->address | bp_info->type | DABR_TRANSLATION);
-	current->thread.last_hit_ubp = NULL;
 	return NOTIFY_STOP;
 }