commit | c84b51e65ea2f256353c339bd87e991b7e64630f | [log] [tgz] |
---|---|---|
author | Paul Gortmaker <paul.gortmaker@windriver.com> | Sun Jul 31 21:36:35 2011 +0000 |
committer | Paul Mundt <lethal@linux-sh.org> | Wed Aug 03 12:37:22 2011 +0900 |
tree | 734cafa184e987329338baa471516c5a935df924 | |
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>