sh: Fix conflicting definitions of ptrace_triggered
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 31 Jul 2011 21:36:35 +0000 (21:36 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 3 Aug 2011 03:37:22 +0000 (12:37 +0900)
commitc84b51e65ea2f256353c339bd87e991b7e64630f
tree734cafa184e987329338baa471516c5a935df924
parent5beabc7fcd99856084e232b37d3280ce353eaf41
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>
arch/sh/include/asm/ptrace.h