git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
ptrace_32.c
diff --git
a/arch/sh/kernel/ptrace_32.c
b/arch/sh/kernel/ptrace_32.c
index
2130ca6
..
92b3c27
100644
(file)
--- a/
arch/sh/kernel/ptrace_32.c
+++ b/
arch/sh/kernel/ptrace_32.c
@@
-63,7
+63,7
@@
static inline int put_stack_long(struct task_struct *task, int offset,
return 0;
}
return 0;
}
-void ptrace_triggered(struct perf_event *bp,
int nmi,
+void ptrace_triggered(struct perf_event *bp,
struct perf_sample_data *data, struct pt_regs *regs)
{
struct perf_event_attr attr;
struct perf_sample_data *data, struct pt_regs *regs)
{
struct perf_event_attr attr;
@@
-91,7
+91,8
@@
static int set_single_step(struct task_struct *tsk, unsigned long addr)
attr.bp_len = HW_BREAKPOINT_LEN_2;
attr.bp_type = HW_BREAKPOINT_R;
attr.bp_len = HW_BREAKPOINT_LEN_2;
attr.bp_type = HW_BREAKPOINT_R;
- bp = register_user_hw_breakpoint(&attr, ptrace_triggered, tsk);
+ bp = register_user_hw_breakpoint(&attr, ptrace_triggered,
+ NULL, tsk);
if (IS_ERR(bp))
return PTR_ERR(bp);
if (IS_ERR(bp))
return PTR_ERR(bp);
@@
-117,7
+118,11
@@
void user_enable_single_step(struct task_struct *child)
set_tsk_thread_flag(child, TIF_SINGLESTEP);
set_tsk_thread_flag(child, TIF_SINGLESTEP);
+ if (ptrace_get_breakpoints(child) < 0)
+ return;
+
set_single_step(child, pc);
set_single_step(child, pc);
+ ptrace_put_breakpoints(child);
}
void user_disable_single_step(struct task_struct *child)
}
void user_disable_single_step(struct task_struct *child)