diff options
Diffstat (limited to 'release/src/linux/linux/arch/mips/kernel')
-rw-r--r-- | release/src/linux/linux/arch/mips/kernel/branch.c | 2 | ||||
-rw-r--r-- | release/src/linux/linux/arch/mips/kernel/mips_ksyms.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/release/src/linux/linux/arch/mips/kernel/branch.c b/release/src/linux/linux/arch/mips/kernel/branch.c index 8165789c..738ae74f 100644 --- a/release/src/linux/linux/arch/mips/kernel/branch.c +++ b/release/src/linux/linux/arch/mips/kernel/branch.c @@ -170,7 +170,7 @@ int __compute_return_epc(struct pt_regs *regs) bit = (insn.i_format.rt >> 2); bit += (bit != 0); bit += 23; - switch (insn.i_format.rt) { + switch (insn.i_format.rt & 3) { case 0: /* bc1f */ case 2: /* bc1fl */ if (~fcr31 & (1 << bit)) diff --git a/release/src/linux/linux/arch/mips/kernel/mips_ksyms.c b/release/src/linux/linux/arch/mips/kernel/mips_ksyms.c index a76613d1..3f07ed47 100644 --- a/release/src/linux/linux/arch/mips/kernel/mips_ksyms.c +++ b/release/src/linux/linux/arch/mips/kernel/mips_ksyms.c @@ -52,6 +52,7 @@ EXPORT_SYMBOL(EISA_bus); */ EXPORT_SYMBOL_NOVERS(memcmp); EXPORT_SYMBOL_NOVERS(memset); +EXPORT_SYMBOL_NOVERS(memchr); EXPORT_SYMBOL_NOVERS(memcpy); EXPORT_SYMBOL_NOVERS(memmove); EXPORT_SYMBOL_NOVERS(strcat); |