drop arm patch from 3.18

diff --git a/queue-3.18/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch b/queue-3.18/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch
deleted file mode 100644 (file)
index 07895f3..0000000
--- a/queue-3.18/arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8fac5cbdfe0f01254d9d265c6aa1a95f94f58595 Mon Sep 17 00:00:00 2001
-From: James Morse <james.morse@arm.com>
-Date: Thu, 24 Jan 2019 16:32:56 +0000
-Subject: arm64: hyp-stub: Forbid kprobing of the hyp-stub
-
-From: James Morse <james.morse@arm.com>
-
-commit 8fac5cbdfe0f01254d9d265c6aa1a95f94f58595 upstream.
-
-The hyp-stub is loaded by the kernel's early startup code at EL2
-during boot, before KVM takes ownership later. The hyp-stub's
-text is part of the regular kernel text, meaning it can be kprobed.
-
-A breakpoint in the hyp-stub causes the CPU to spin in el2_sync_invalid.
-
-Add it to the __hyp_text.
-
-Signed-off-by: James Morse <james.morse@arm.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kernel/hyp-stub.S |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm64/kernel/hyp-stub.S
-+++ b/arch/arm64/kernel/hyp-stub.S
-@@ -26,6 +26,8 @@
- #include <asm/virt.h>
- 
-       .text
-+      .pushsection    .hyp.text, "ax"
-+
-       .align 11
- 
- ENTRY(__hyp_stub_vectors)

diff --git a/queue-3.18/series b/queue-3.18/series
index cc5dc22df2705e4de39d1b409e3b209ed9cb5d95..c880f59354689163e8c7b751ae0a0faca7ebf0c2 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -23,7 +23,6 @@ l2tp-remove-l2specific_len-dependency-in-l2tp_core.patch
 l2tp-fix-reading-optional-fields-of-l2tpv3.patch
 cifs-do-not-count-enodata-as-failure-for-query-directory.patch
 fs-dcache-fix-incorrect-nr_dentry_unused-accounting-in-shrink_dcache_sb.patch
-arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch
 gfs2-revert-fix-loop-in-gfs2_rbm_find.patch
 platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch
 platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch