* [PATCH] sh: Fix conflicting definitions of ptrace_triggered
@ 2011-07-31 21:36 Paul Gortmaker
2011-08-03 3:37 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Paul Gortmaker @ 2011-07-31 21:36 UTC (permalink / raw)
To: lethal; +Cc: linux-sh, linux-kernel
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>
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) \
--
1.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sh: Fix conflicting definitions of ptrace_triggered
2011-07-31 21:36 [PATCH] sh: Fix conflicting definitions of ptrace_triggered Paul Gortmaker
@ 2011-08-03 3:37 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2011-08-03 3:37 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-sh, linux-kernel
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-03 3:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-31 21:36 [PATCH] sh: Fix conflicting definitions of ptrace_triggered Paul Gortmaker
2011-08-03 3:37 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox