From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 5 May 2015 22:00:45 +0000 (+0200)
Subject: delete 3.19 broken mips patch
X-Git-Tag: v3.10.77~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4fd6df65502952c37b19bf499c219c21874cebf;p=thirdparty%2Fkernel%2Fstable-queue.git

delete 3.19 broken mips patch
---

diff --git a/queue-3.19/mips-unaligned-fix-regular-load-store-instruction-emulation-for-eva.patch b/queue-3.19/mips-unaligned-fix-regular-load-store-instruction-emulation-for-eva.patch
deleted file mode 100644
index 78f2e99c5ae..00000000000
--- a/queue-3.19/mips-unaligned-fix-regular-load-store-instruction-emulation-for-eva.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 6eae35485b26f9e51ab896eb8a936bed9908fdf6 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <markos.chandras@imgtec.com>
-Date: Mon, 9 Mar 2015 14:54:52 +0000
-Subject: MIPS: unaligned: Fix regular load/store instruction emulation for EVA
-
-From: Markos Chandras <markos.chandras@imgtec.com>
-
-commit 6eae35485b26f9e51ab896eb8a936bed9908fdf6 upstream.
-
-When emulating a regular lh/lw/lhu/sh/sw we need to use the appropriate
-instruction if we are in EVA mode. This is necessary for userspace
-applications which trigger alignment exceptions. In such case, the
-userspace load/store instruction needs to be emulated with the correct
-eva/non-eva instruction by the kernel emulator.
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-Fixes: c1771216ab48 ("MIPS: kernel: unaligned: Handle unaligned accesses for EVA")
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/9503/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/mips/kernel/unaligned.c |   52 ++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 47 insertions(+), 5 deletions(-)
-
---- a/arch/mips/kernel/unaligned.c
-+++ b/arch/mips/kernel/unaligned.c
-@@ -564,7 +564,15 @@ static void emulate_load_store_insn(stru
- 		if (!access_ok(VERIFY_READ, addr, 2))
- 			goto sigbus;
- 
--		LoadHW(addr, value, res);
-+		if (config_enabled(CONFIG_EVA)) {
-+			if (segment_eq(get_fs(), get_ds()))
-+				LoadHW(addr, value, res);
-+			else
-+				LoadHWE(addr, value, res);
-+		} else {
-+			LoadHW(addr, value, res);
-+		}
-+
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
-@@ -575,7 +583,15 @@ static void emulate_load_store_insn(stru
- 		if (!access_ok(VERIFY_READ, addr, 4))
- 			goto sigbus;
- 
--		LoadW(addr, value, res);
-+		if (config_enabled(CONFIG_EVA)) {
-+			if (segment_eq(get_fs(), get_ds()))
-+				LoadW(addr, value, res);
-+			else
-+				LoadWE(addr, value, res);
-+		} else {
-+			LoadW(addr, value, res);
-+		}
-+
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
-@@ -586,7 +602,15 @@ static void emulate_load_store_insn(stru
- 		if (!access_ok(VERIFY_READ, addr, 2))
- 			goto sigbus;
- 
--		LoadHWU(addr, value, res);
-+		if (config_enabled(CONFIG_EVA)) {
-+			if (segment_eq(get_fs(), get_ds()))
-+				LoadHWU(addr, value, res);
-+			else
-+				LoadHWUE(addr, value, res);
-+		} else {
-+			LoadHWU(addr, value, res);
-+		}
-+
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
-@@ -645,7 +669,16 @@ static void emulate_load_store_insn(stru
- 
- 		compute_return_epc(regs);
- 		value = regs->regs[insn.i_format.rt];
--		StoreHW(addr, value, res);
-+
-+		if (config_enabled(CONFIG_EVA)) {
-+			if (segment_eq(get_fs(), get_ds()))
-+				StoreHW(addr, value, res);
-+			else
-+				StoreHWE(addr, value, res);
-+		} else {
-+			StoreHW(addr, value, res);
-+		}
-+
- 		if (res)
- 			goto fault;
- 		break;
-@@ -656,7 +689,16 @@ static void emulate_load_store_insn(stru
- 
- 		compute_return_epc(regs);
- 		value = regs->regs[insn.i_format.rt];
--		StoreW(addr, value, res);
-+
-+		if (config_enabled(CONFIG_EVA)) {
-+			if (segment_eq(get_fs(), get_ds()))
-+				StoreW(addr, value, res);
-+			else
-+				StoreWE(addr, value, res);
-+		} else {
-+			StoreW(addr, value, res);
-+		}
-+
- 		if (res)
- 			goto fault;
- 		break;
diff --git a/queue-3.19/series b/queue-3.19/series
index 305a6dbcdbe..a733c6964a2 100644
--- a/queue-3.19/series
+++ b/queue-3.19/series
@@ -35,7 +35,6 @@ mips-kvm-handle-msa-disabled-exceptions-from-guest.patch
 mips-lose_fpu-disable-fpu-when-msa-enabled.patch
 mips-malta-detect-and-fix-bad-memsize-values.patch
 mips-asm-asm-eva-introduce-kernel-load-store-variants.patch
-mips-unaligned-fix-regular-load-store-instruction-emulation-for-eva.patch
 mips-loongson-3-add-irqf_no_suspend-to-cascade-irqaction.patch
 mips-hibernate-flush-tlb-entries-earlier.patch
 staging-panel-fix-lcd-type.patch