From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60963 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbcFDSlI (ORCPT ); Sat, 4 Jun 2016 14:41:08 -0400 Subject: Patch "MIPS: Fix MSA ld_*/st_* asm macros to use PTR_ADDU" has been added to the 4.5-stable tree To: james.hogan@imgtec.com, gregkh@linuxfoundation.org, paul.burton@imgtec.com, ralf@linux-mips.org Cc: , From: Date: Sat, 04 Jun 2016 11:41:07 -0700 Message-ID: <146506566761114@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: Fix MSA ld_*/st_* asm macros to use PTR_ADDU to the 4.5-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-fix-msa-ld_-st_-asm-macros-to-use-ptr_addu.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ea1688573426adc2587ed52d086b51c7c62eaca3 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Fri, 15 Apr 2016 10:07:24 +0100 Subject: MIPS: Fix MSA ld_*/st_* asm macros to use PTR_ADDU From: James Hogan commit ea1688573426adc2587ed52d086b51c7c62eaca3 upstream. The MSA ld_*/st_* assembler macros for when the toolchain doesn't support MSA use addu to offset the base address. However it is a virtual memory pointer so fix it to use PTR_ADDU which expands to daddu for 64-bit kernels. Signed-off-by: James Hogan Cc: Paul Burton Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/13062/ Signed-off-by: Ralf Baechle Signed-off-by: Greg Kroah-Hartman --- arch/mips/include/asm/asmmacro.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/arch/mips/include/asm/asmmacro.h +++ b/arch/mips/include/asm/asmmacro.h @@ -393,7 +393,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word LDB_MSA_INSN | (\wd << 6) .set pop .endm @@ -402,7 +402,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word LDH_MSA_INSN | (\wd << 6) .set pop .endm @@ -411,7 +411,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word LDW_MSA_INSN | (\wd << 6) .set pop .endm @@ -420,7 +420,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word LDD_MSA_INSN | (\wd << 6) .set pop .endm @@ -429,7 +429,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word STB_MSA_INSN | (\wd << 6) .set pop .endm @@ -438,7 +438,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word STH_MSA_INSN | (\wd << 6) .set pop .endm @@ -447,7 +447,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word STW_MSA_INSN | (\wd << 6) .set pop .endm @@ -456,7 +456,7 @@ .set push .set noat SET_HARDFLOAT - addu $1, \base, \off + PTR_ADDU $1, \base, \off .word STD_MSA_INSN | (\wd << 6) .set pop .endm Patches currently in stable-queue which might be from james.hogan@imgtec.com are queue-4.5/mips64-r6-r2-emulation-bugfix.patch queue-4.5/mips-fix-uapi-include-in-exported-asm-siginfo.h.patch queue-4.5/mips-disable-preemption-during-prctl-pr_set_fp_mode.patch queue-4.5/mips-fix-sigreturn-via-vdso-on-micromips-kernel.patch queue-4.5/mips-fix-siginfo.h-to-use-strict-posix-types.patch queue-4.5/mips-don-t-unwind-to-user-mode-with-eva.patch queue-4.5/mips-vdso-build-with-fno-strict-aliasing.patch queue-4.5/mips-fix-watchpoint-restoration.patch queue-4.5/mips-build-micromips-vdso-for-micromips-kernels.patch queue-4.5/mips-math-emu-fix-jalr-emulation-when-rd-0.patch queue-4.5/mips-fix-msa-ld_-st_-asm-macros-to-use-ptr_addu.patch queue-4.5/mips-avoid-using-unwind_stack-with-usermode.patch queue-4.5/mips-prevent-restoration-of-msa-context-in-non-msa-kernels.patch queue-4.5/mips-use-copy_s.fmt-rather-than-copy_u.fmt.patch