From 240187b43673709e321ec5c184aa3551691d3cee Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 1 Jul 2011 15:24:53 +0200 Subject: [PATCH] --- yaml --- r: 257082 b: refs/heads/master c: 29dfc4fd7e792854b30d771d4e299fbdd2adb763 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/hw_breakpoint.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a63a7a38d08..a8ae0c81ef72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ae9a34d747f9abf2bcc85dc0e77b951513ccdf2 +refs/heads/master: 29dfc4fd7e792854b30d771d4e299fbdd2adb763 diff --git a/trunk/arch/powerpc/include/asm/hw_breakpoint.h b/trunk/arch/powerpc/include/asm/hw_breakpoint.h index 1c33ec17ca36..80fd4d2b4a62 100644 --- a/trunk/arch/powerpc/include/asm/hw_breakpoint.h +++ b/trunk/arch/powerpc/include/asm/hw_breakpoint.h @@ -57,7 +57,7 @@ void hw_breakpoint_pmu_read(struct perf_event *bp); extern void flush_ptrace_hw_breakpoint(struct task_struct *tsk); extern struct pmu perf_ops_bp; -extern void ptrace_triggered(struct perf_event *bp, int nmi, +extern void ptrace_triggered(struct perf_event *bp, struct perf_sample_data *data, struct pt_regs *regs); static inline void hw_breakpoint_disable(void) {