diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /arch/sh/kernel | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/ptrace_32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c index 2130ca674e9..3d7b209b217 100644 --- 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) | |||
| 117 | 117 | ||
| 118 | set_tsk_thread_flag(child, TIF_SINGLESTEP); | 118 | set_tsk_thread_flag(child, TIF_SINGLESTEP); |
| 119 | 119 | ||
| 120 | if (ptrace_get_breakpoints(child) < 0) | ||
| 121 | return; | ||
| 122 | |||
| 120 | set_single_step(child, pc); | 123 | set_single_step(child, pc); |
| 124 | ptrace_put_breakpoints(child); | ||
| 121 | } | 125 | } |
| 122 | 126 | ||
| 123 | void user_disable_single_step(struct task_struct *child) | 127 | void user_disable_single_step(struct task_struct *child) |