diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
| commit | ae95d7126104591348d37aaf78c8325967e02386 (patch) | |
| tree | 3270712f030549d77d4c55246d056e02b9def29d /arch/mips/include/asm/mips-r2-to-r6-emul.h | |
| parent | ipv6: fix inet6_lookup_listener() (diff) | |
| parent | Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| download | linux-ae95d7126104591348d37aaf78c8325967e02386.tar.xz linux-ae95d7126104591348d37aaf78c8325967e02386.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/mips/include/asm/mips-r2-to-r6-emul.h')
| -rw-r--r-- | arch/mips/include/asm/mips-r2-to-r6-emul.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mips-r2-to-r6-emul.h b/arch/mips/include/asm/mips-r2-to-r6-emul.h index 1f6ea8352ca9..20621e1ca238 100644 --- a/arch/mips/include/asm/mips-r2-to-r6-emul.h +++ b/arch/mips/include/asm/mips-r2-to-r6-emul.h @@ -79,7 +79,7 @@ struct r2_decoder_table { }; -extern void do_trap_or_bp(struct pt_regs *regs, unsigned int code, +extern void do_trap_or_bp(struct pt_regs *regs, unsigned int code, int si_code, const char *str); #ifndef CONFIG_MIPSR2_TO_R6_EMULATOR |