This series cleans up the code used to emulate pre-r6 instructions that were removed by MIPSr6 when running on a MIPSr6 CPU. It also removes the dependency of the pre-r6 emulation code on uniprocessor kernels, since there's no reason it shouldn't work with SMP kernels. Applies atop v4.9-rc1. Paul Burton (4): MIPS: Remove r2_emul_return from struct thread_info MIPS: Cleanup LLBit handling in switch_to MIPS: Allow pre-r6 emulation on SMP MIPSr6 kernels MIPS: Remove RESTORE_ALL_AND_RET arch/mips/Kconfig | 4 +--- arch/mips/include/asm/stackframe.h | 12 ++++-------- arch/mips/include/asm/switch_to.h | 18 ++++++++++++------ arch/mips/include/asm/thread_info.h | 1 - arch/mips/kernel/asm-offsets.c | 1 - arch/mips/kernel/entry.S | 18 ------------------ arch/mips/kernel/traps.c | 2 -- 7 files changed, 17 insertions(+), 39 deletions(-) -- 2.10.0