aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuacai Chen <chenhc@lemote.com>2016-09-05 08:48:03 +0800
committerRalf Baechle <ralf@linux-mips.org>2016-09-13 17:25:11 +0200
commit3cbc6fc9c99f1709203711f125bc3b79487aba06 (patch)
tree8e0e50bbfca288571dc7a605e33e2e9d8d28f482
parentMIPS: paravirt: Fix undefined reference to smp_bootstrap (diff)
downloadlinux-dev-3cbc6fc9c99f1709203711f125bc3b79487aba06.tar.xz
linux-dev-3cbc6fc9c99f1709203711f125bc3b79487aba06.zip
MIPS: Add a missing ".set pop" in an early commit
Commit 842dfc11ea9a21 ("MIPS: Fix build with binutils 2.24.51+") missing a ".set pop" in macro fpu_restore_16even, so add it. Signed-off-by: Huacai Chen <chenhc@lemote.com> Acked-by: Manuel Lauss <manuel.lauss@gmail.com> Cc: Steven J . Hill <Steven.Hill@caviumnetworks.com> Cc: Fuxin Zhang <zhangfx@lemote.com> Cc: Zhangjin Wu <wuzhangjin@gmail.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org # 3.18+ Patchwork: https://patchwork.linux-mips.org/patch/14210/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/include/asm/asmmacro.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 56584a659183..83054f79f72a 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -157,6 +157,7 @@
ldc1 $f28, THREAD_FPR28(\thread)
ldc1 $f30, THREAD_FPR30(\thread)
ctc1 \tmp, fcr31
+ .set pop
.endm
.macro fpu_restore_16odd thread