Paul Gortmaker c84b51e65e 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>

2011-08-03 12:37:22 +09:00

..

alpha

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

arm

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

2011-08-01 06:13:48 -10:00

avr32

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

blackfin

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

cris

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

frv

frv: remove unnecessary code

2011-07-29 23:41:09 -07:00

h8300

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

ia64

Merge branch 'gpiolib' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

2011-08-01 13:41:43 -10:00

m32r

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

m68k

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2011-07-31 14:30:59 -10:00

microblaze

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

2011-07-27 09:24:20 -07:00

mips

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

mn10300

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

openrisc

OpenRISC: Miscellaneous

2011-07-22 18:46:41 +02:00

parisc

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

powerpc

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:12:10 -07:00

s390

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

score

modules: make arch's use default loader hooks

2011-07-24 22:06:04 +09:30

sh

sh: Fix conflicting definitions of ptrace_triggered

2011-08-03 12:37:22 +09:00

sparc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2011-07-31 14:30:59 -10:00

tile

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

um

ptrace: unify show_regs() prototype

2011-07-26 16:49:43 -07:00

unicore32

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

x86

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

xtensa

atomic: cleanup asm-generic atomic*.h inclusion

2011-07-26 16:49:47 -07:00

.gitignore

…

Kconfig

…