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 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
ptrace.c
diff --git
a/arch/powerpc/kernel/ptrace.c
b/arch/powerpc/kernel/ptrace.c
index
3177617
..
05b7dd2
100644
(file)
--- a/
arch/powerpc/kernel/ptrace.c
+++ b/
arch/powerpc/kernel/ptrace.c
@@
-973,7
+973,7
@@
int ptrace_set_debugreg(struct task_struct *task, unsigned long addr,
&attr.bp_type);
thread->ptrace_bps[0] = bp = register_user_hw_breakpoint(&attr,
-
ptrace_triggered
, task);
+
ptrace_triggered, NULL
, task);
if (IS_ERR(bp)) {
thread->ptrace_bps[0] = NULL;
ptrace_put_breakpoints(task);