Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle: "More 3.18 fixes for MIPS: - backtraces were not quite working on on 64-bit kernels - loongson needs a different cache coherency setting - Loongson 3 is a MIPS64 R2 version but due to erratum we treat is an older architecture revision. - fix build errors due to undefined references to __node_distances for certain configurations. - fix instruction decodig in the jump label code. - for certain configurations copy_{from,to}_user destroy the content of $3 so that register needs to be marked as clobbed by the calling code. - Hardware Table Walker fixes. - fill the delay slot of the last instruction of memcpy otherwise whatever ends up there randomly might have undesirable effects. - ensure get_user/__get_user always zero the variable to be read even in case of an error" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: MIPS: jump_label.c: Handle the microMIPS J instruction encoding MIPS: jump_label.c: Correct the span of the J instruction MIPS: Zero variable read by get_user / __get_user in case of an error. MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller MIPS: tlb-r4k: Add missing HTW stop/start sequences MIPS: asm: uaccess: Add v1 register to clobber list on EVA MIPS: oprofile: Fix backtrace on 64-bit kernel MIPS: Loongson: Set Loongson-3's ISA level to MIPS64R1 MIPS: Loongson: Fix the write-combine CCA value setting MIPS: IP27: Fix __node_distances undefined error MIPS: Loongson3: Fix __node_distances undefined error
Showing
- arch/mips/include/asm/jump_label.h 7 additions, 1 deletionarch/mips/include/asm/jump_label.h
- arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 0 additions, 2 deletionsarch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
- arch/mips/include/asm/uaccess.h 8 additions, 4 deletionsarch/mips/include/asm/uaccess.h
- arch/mips/kernel/cpu-probe.c 5 additions, 2 deletionsarch/mips/kernel/cpu-probe.c
- arch/mips/kernel/jump_label.c 32 additions, 10 deletionsarch/mips/kernel/jump_label.c
- arch/mips/lib/memcpy.S 1 addition, 0 deletionsarch/mips/lib/memcpy.S
- arch/mips/loongson/loongson-3/numa.c 1 addition, 0 deletionsarch/mips/loongson/loongson-3/numa.c
- arch/mips/mm/tlb-r4k.c 4 additions, 0 deletionsarch/mips/mm/tlb-r4k.c
- arch/mips/oprofile/backtrace.c 1 addition, 1 deletionarch/mips/oprofile/backtrace.c
- arch/mips/sgi-ip27/ip27-memory.c 1 addition, 0 deletionsarch/mips/sgi-ip27/ip27-memory.c
Please register or sign in to comment