diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-07-31 17:36:35 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-02 23:37:22 -0400 |
| commit | c84b51e65ea2f256353c339bd87e991b7e64630f (patch) | |
| tree | 734cafa184e987329338baa471516c5a935df924 /arch/sh | |
| parent | 5beabc7fcd99856084e232b37d3280ce353eaf41 (diff) | |
sh: Fix conflicting definitions of ptrace_triggered
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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index b97baf81a87b..2d3679b2447f 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, | |||
| 123 | struct perf_event; | 123 | struct perf_event; |
| 124 | struct perf_sample_data; | 124 | struct perf_sample_data; |
| 125 | 125 | ||
| 126 | extern void ptrace_triggered(struct perf_event *bp, int nmi, | 126 | extern void ptrace_triggered(struct perf_event *bp, |
| 127 | struct perf_sample_data *data, struct pt_regs *regs); | 127 | struct perf_sample_data *data, struct pt_regs *regs); |
| 128 | 128 | ||
| 129 | #define task_pt_regs(task) \ | 129 | #define task_pt_regs(task) \ |