From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:55390 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753193AbbEHOno (ORCPT ); Fri, 8 May 2015 10:43:44 -0400 Subject: Patch "MIPS: kernel: entry.S: Set correct ISA level for mips_ihb" has been added to the 4.0-stable tree To: ralf@linux-mips.org, gregkh@linuxfoundation.org, markos.chandras@imgtec.com Cc: , From: Date: Fri, 08 May 2015 16:43:20 +0200 In-Reply-To: <48b943431ab90523cb388d461fb30c585c2d27f9.1431087908.git.ralf@linux-mips.org> Message-ID: <1431096200994@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled MIPS: kernel: entry.S: Set correct ISA level for mips_ihb to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-kernel-entry.s-set-correct-isa-level-for-mips_ihb.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ralf@linux-mips.org Fri May 8 16:39:44 2015 From: Ralf Baechle Date: Tue, 3 Mar 2015 18:48:49 +0000 Subject: MIPS: kernel: entry.S: Set correct ISA level for mips_ihb To: stable@vger.kernel.org Message-ID: <48b943431ab90523cb388d461fb30c585c2d27f9.1431087908.git.ralf@linux-mips.org> From: Markos Chandras Commit aebac99384f7a6d83a3dcd42bf2481eed2670083 upstream. Commit 6ebb496ffc7e("MIPS: kernel: entry.S: Add MIPS R6 related definitions") added the MIPSR6 definition but it did not update the ISA level of the actual assembly code so a pre-MIPSR6 jr.hb instruction was generated instead. Fix this by using the MISP_ISA_LEVEL_RAW macro. Signed-off-by: Markos Chandras Fixes: 6ebb496ffc7e("MIPS: kernel: entry.S: Add MIPS R6 related definitions") Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/9386/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/entry.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/mips/kernel/entry.S +++ b/arch/mips/kernel/entry.S @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -185,7 +186,7 @@ syscall_exit_work: * For C code use the inline version named instruction_hazard(). */ LEAF(mips_ihb) - .set mips32r2 + .set MIPS_ISA_LEVEL_RAW jr.hb ra nop END(mips_ihb) Patches currently in stable-queue which might be from ralf@linux-mips.org are queue-4.0/mips-octeon-remove-udelay-causing-huge-irq-latency.patch queue-4.0/mips-makefile-fix-mips-ase-detection-code.patch queue-4.0/mips-r4kcache-use-correct-base-register-for-mips-r6-cache-flushes.patch queue-4.0/mips-fix-cpu_has_mips_r2_exec_hazard.patch queue-4.0/mips-ralink-fix-bad-config-symbol-in-pci-makefile.patch queue-4.0/revert-mips-remove-race-window-in-page-fault-handling.patch queue-4.0/mips-fix-race-condition-in-lazy-cache-flushing.patch queue-4.0/mips-bcm63xx-move-bcm63xx_gpio_init-to-bcm63xx_register_devices.patch queue-4.0/mips-octeon-delete-override-of-cpu_has_mips_r2_exec_hazard.patch queue-4.0/mips-asm-spinlock-fix-addiu-instruction-for-r10000_llsc_war-case.patch queue-4.0/mips-kconfig-disable-smp-cps-for-64-bit.patch queue-4.0/mips-bcm47xx-fix-detecting-microsoft-mn-700-asus-wl500g.patch queue-4.0/mips-octeon-use-correct-csr-to-soft-reset.patch queue-4.0/revert-mips-avoid-pipeline-stalls-on-some-mips32r2-cores.patch queue-4.0/mips-octeon-dma-octeon-fix-ohci-usb-config-check.patch queue-4.0/mips-octeon-fix-pci-interrupt-mapping-for-d-link-dsr-1000n.patch queue-4.0/mips-kconfig-fix-typo-for-the-r2-to-r6-emulator-kernel-parameter.patch queue-4.0/ssb-fix-kconfig-dependencies.patch queue-4.0/mips-kernel-entry.s-set-correct-isa-level-for-mips_ihb.patch queue-4.0/mips-netlogic-fix-for-sata-phy-init.patch queue-4.0/mips-ralink-add-missing-symbol-for-ralink_ill_acc.patch queue-4.0/mips-asm-elf-set-o32-default-fpu-flags.patch queue-4.0/mips-smp-cps-cpu_set-fpu-mask-if-fpu-present.patch