Re: [PATCH] sh: Fix conflicting definitions of ptrace_triggered

[Paul Mundt]

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@xxxxxxxxxxxxx>
> 
Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/