Messages in this thread | | | Date | Wed, 3 Aug 2011 12:37:32 +0900 | From | Paul Mundt <> | Subject | Re: [PATCH] sh: Fix conflicting definitions of ptrace_triggered |
| |
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.
| |