remove queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch

diff --git a/queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch b/queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch
deleted file mode 100644 (file)
index 1ad1632..0000000
--- a/queue-3.18/arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 448c077eeb02240c430db2a2c3bf5285a4c65d66 Mon Sep 17 00:00:00 2001
-From: Matthijs van Duin <matthijsvanduin@gmail.com>
-Date: Thu, 16 Feb 2017 01:05:04 +0100
-Subject: ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
-
-From: Matthijs van Duin <matthijsvanduin@gmail.com>
-
-commit 448c077eeb02240c430db2a2c3bf5285a4c65d66 upstream.
-
-'adr' yields a data-pointer, not a function-pointer.
-
-Fixes: 999f934de195 ("ARM: omap5/dra7xx: Enable booting secondary
-CPU in HYP mode")
-Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/mach-omap2/omap-headsmp.S |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm/mach-omap2/omap-headsmp.S
-+++ b/arch/arm/mach-omap2/omap-headsmp.S
-@@ -17,6 +17,7 @@
- 
- #include <linux/linkage.h>
- #include <linux/init.h>
-+#include <asm/assembler.h>
- 
- #include "omap44xx.h"
- 
-@@ -56,7 +57,7 @@ wait_2:      ldr     r2, =AUX_CORE_BOOT0_PA  @ rea
-       cmp     r0, r4
-       bne     wait_2
-       ldr     r12, =API_HYP_ENTRY
--      adr     r0, hyp_boot
-+      badr    r0, hyp_boot
-       smc     #0
- hyp_boot:
-       b       secondary_startup

diff --git a/queue-3.18/series b/queue-3.18/series
index 824e085790192028b98312eedd04db3d6ba6211e..3f559c4d3777a28146770ebf1ce099f4fa26d844 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -5,7 +5,6 @@ cpupower-fix-turbo-frequency-reporting-for-pre-sandy-bridge-cores.patch
 powerpc-powernv-fix-opal_exit-tracepoint-opcode.patch
 power-supply-bq24190_charger-fix-irq-trigger-to-irqf_trigger_falling.patch
 power-supply-bq24190_charger-call-set_mode_host-on-pm_resume.patch
-arm-omap5-dra7-fix-hyp-mode-boot-for-thumb2-build.patch
 mwifiex-debugfs-fix-sometimes-off-by-1-ssid-print.patch
 mwifiex-avoid-skipping-wep-key-deletion-for-ap.patch
 x86-pci-calgary-fix-iommu_free-comparison-of-unsigned-expression-0.patch