diff options
| author | Ben Hutchings <benh@debian.org> | 2014-09-07 02:58:39 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-09-07 02:58:39 +0000 |
| commit | 9852c42848db8d06c7b99934a60172ec66c4da6a (patch) | |
| tree | 345556a8855cafe3085413131e319dec5a05c6fb | |
| parent | 132c1763b5d803a6ae48e32bbddae1492e4a9273 (diff) | |
| download | kernel_replicant_linux-9852c42848db8d06c7b99934a60172ec66c4da6a.tar.gz kernel_replicant_linux-9852c42848db8d06c7b99934a60172ec66c4da6a.tar.bz2 kernel_replicant_linux-9852c42848db8d06c7b99934a60172ec66c4da6a.zip | |
Drop bug fix that was included in 3.16.2
svn path=/dists/trunk/linux/; revision=21763
| -rw-r--r-- | debian/patches/bugfix/mips/MIPS-math-emu-cp1emu-Fix-typo-when-returning-to-regi.patch | 42 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/debian/patches/bugfix/mips/MIPS-math-emu-cp1emu-Fix-typo-when-returning-to-regi.patch b/debian/patches/bugfix/mips/MIPS-math-emu-cp1emu-Fix-typo-when-returning-to-regi.patch deleted file mode 100644 index 43a123cab361..000000000000 --- a/debian/patches/bugfix/mips/MIPS-math-emu-cp1emu-Fix-typo-when-returning-to-regi.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Rob Kendrick <rob.kendrick@codethink.co.uk> -Date: Wed, 23 Jul 2014 13:41:58 +0100 -Subject: MIPS: math-emu: cp1emu: Fix typo when returning to register file -Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=8476cba1198d0869467d1d7bf0d5f8808a724986 - -The commit 08a07904e182 (MIPS: math-emu: Remove most ifdefery) in -v3.16-rc1 switched from build time to runtime detection for the CPU ISA -level. - -However, along the way, a typo was introduced in the code path -to return the value to the register file. Previously, the -MIPSInst_FD macro was used but the above commit switched to -MIPSInst_RT leading to regressions. - -Link: http://www.linux-mips.org/archives/linux-mips/2014-07/msg00484.html -Reported-by: Rob Kendrick <rob.kendrick@codethink.co.uk> -Reviewed-by: Paul Burton <paul.burton@imgtec.com> -Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> -Signed-off-by: Rob Kendrick <rob.kendrick@codethink.co.uk> -Tested-by: Aurelien Jarno <aurelien@aurel32.net> -Patchwork: http://patchwork.linux-mips.org/patch/7448/ -Signed-off-by: James Hogan <james.hogan@imgtec.com> ---- - arch/mips/math-emu/cp1emu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c -index 736c17a..bf0fc6b 100644 ---- 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) --- -1.7.10.4 - diff --git a/debian/patches/series b/debian/patches/series index c2ef5721094b..1136480b6a6d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -53,7 +53,6 @@ bugfix/mips/disable-advansys.patch bugfix/arm/ixp4xx_iobe.patch bugfix/m68k/ethernat-kconfig.patch bugfix/mips/MIPS-ZBOOT-add-missing-linux-string.h-include.patch -bugfix/mips/MIPS-math-emu-cp1emu-Fix-typo-when-returning-to-regi.patch bugfix/mips/MIPS-OCTEON-make-get_system_type-thread-safe.patch bugfix/mips/MIPS-O32-32-bit-Fix-bug-which-can-cause-incorrect-sy.patch bugfix/mips/MIPS-tlbex-fix-a-missing-statement-for-HUGETLB.patch |