| Message ID | 1312148195-32658-1-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c84b51e65ea2f256353c339bd87e991b7e64630f |
| Headers | show |
On Sun, Jul 31, 2011 at 05:36:35PM -0400, Paul Gortmaker wrote: > The extra nmi argument is causing this compile fail: > > CC arch/sh/kernel/ptrace_32.o > arch/sh/kernel/ptrace_32.c:66:6: error: conflicting types for 'ptrace_triggered' > arch/sh/include/asm/ptrace.h:126:13: note: previous declaration of 'ptrace_triggered' was here > make[3]: *** [arch/sh/kernel/ptrace_32.o] Error 1 > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index b97baf8..2d3679b 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h @@ -123,7 +123,7 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, struct perf_event; struct perf_sample_data; -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); #define task_pt_regs(task) \
The extra nmi argument is causing this compile fail: CC arch/sh/kernel/ptrace_32.o arch/sh/kernel/ptrace_32.c:66:6: error: conflicting types for 'ptrace_triggered' arch/sh/include/asm/ptrace.h:126:13: note: previous declaration of 'ptrace_triggered' was here make[3]: *** [arch/sh/kernel/ptrace_32.o] Error 1 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>