Merge commit 'v2.6.39-rc7' into sched/core

2011-05-12 09:36:18 +02:00
parent 7142d17e8f 693d92a1bb
commit 9cb5baba5e
560 changed files with 6290 additions and 3272 deletions
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@ -117,7 +117,11 @@ void user_enable_single_step(struct task_struct *child)

 	set_tsk_thread_flag(child, TIF_SINGLESTEP);

+	if (ptrace_get_breakpoints(child) < 0)
+		return;
+
 	set_single_step(child, pc);
+	ptrace_put_breakpoints(child);
 }

 void user_disable_single_step(struct task_struct *child)