From b01cb9941b55e2800799fba475160b3e748fe317 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 Aug 2014 11:46:13 -0500
Subject: [PATCH] 3.16-stable patches

added patches:
	mips-math-emu-fix-instruction-decoding.patch
---
 ...ps-math-emu-fix-instruction-decoding.patch | 30 +++++++++++++++++++
 queue-3.16/series                             |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 queue-3.16/mips-math-emu-fix-instruction-decoding.patch

diff --git a/queue-3.16/mips-math-emu-fix-instruction-decoding.patch b/queue-3.16/mips-math-emu-fix-instruction-decoding.patch
new file mode 100644
index 00000000000..fc7c4d63401
--- /dev/null
+++ b/queue-3.16/mips-math-emu-fix-instruction-decoding.patch
@@ -0,0 +1,30 @@
+From c3b9b945e02e011c63522761e91133ea43eb6939 Mon Sep 17 00:00:00 2001
+From: Rob Kendrick <rob.kendrick@codethink.co.uk>
+Date: Wed, 23 Jul 2014 10:03:58 +0100
+Subject: MIPS: math-emu: Fix instruction decoding.
+
+From: Rob Kendrick <rob.kendrick@codethink.co.uk>
+
+commit c3b9b945e02e011c63522761e91133ea43eb6939 upstream.
+
+Tested-by: Aurelien Jarno <aurelien@aurel32.net>
+Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Cc: Markos Chandras <markos.chandras@imgtec.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/math-emu/cp1emu.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/math-emu/cp1emu.c
++++ b/arch/mips/math-emu/cp1emu.c
+@@ -1827,7 +1827,7 @@ dcopuop:
+ 	case -1:
+ 
+ 		if (cpu_has_mips_4_5_r)
+-			cbit = fpucondbit[MIPSInst_RT(ir) >> 2];
++			cbit = fpucondbit[MIPSInst_FD(ir) >> 2];
+ 		else
+ 			cbit = FPU_CSR_COND;
+ 		if (rv.w)
diff --git a/queue-3.16/series b/queue-3.16/series
index 3b630d47d4c..4a6e33765e2 100644
--- a/queue-3.16/series
+++ b/queue-3.16/series
@@ -1 +1,2 @@
 stable_kernel_rules-add-pointer-to-netdev-faq-for-network-patches.patch
+mips-math-emu-fix-instruction-decoding.patch
-- 
2.47.3