kernel: Update to version 4.1.3

[people/amarx/ipfire-3.x.git] / kernel / patches / linux-4.0-arm-exynos-thumb2-fix-build.patch

diff --git a/kernel/patches/linux-4.0-arm-exynos-thumb2-fix-build.patch b/kernel/patches/linux-4.0-arm-exynos-thumb2-fix-build.patch
deleted file mode 100644 (file)
index 2662909..0000000
--- a/kernel/patches/linux-4.0-arm-exynos-thumb2-fix-build.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 12833bacf5d904c2dac0c3f52b2ebde5f2c5a2bc Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Date: Wed, 25 Mar 2015 07:41:43 +0100
-Subject: ARM: 8325/1: exynos: move resume code to .text section
-
-This code calls cpu_resume() using a straight branch (b), so
-now that we have moved cpu_resume() back to .text, this should
-be moved there as well. Any direct references to symbols that will
-remain in the .data section are replaced with explicit PC-relative
-references.
-
-Acked-by: Nicolas Pitre <nico@linaro.org>
-Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-
-diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S
-index 31d2583..cf95079 100644
---- a/arch/arm/mach-exynos/sleep.S
-+++ b/arch/arm/mach-exynos/sleep.S
-@@ -23,14 +23,7 @@
- #define CPU_MASK      0xff0ffff0
- #define CPU_CORTEX_A9 0x410fc090
- 
--      /*
--       * The following code is located into the .data section. This is to
--       * allow l2x0_regs_phys to be accessed with a relative load while we
--       * can't rely on any MMU translation. We could have put l2x0_regs_phys
--       * in the .text section as well, but some setups might insist on it to
--       * be truly read-only. (Reference from: arch/arm/kernel/sleep.S)
--       */
--      .data
-+      .text
-       .align
- 
-       /*
-@@ -69,10 +62,12 @@ ENTRY(exynos_cpu_resume_ns)
-       cmp     r0, r1
-       bne     skip_cp15
- 
--      adr     r0, cp15_save_power
-+      adr     r0, _cp15_save_power
-       ldr     r1, [r0]
--      adr     r0, cp15_save_diag
-+      ldr     r1, [r0, r1]
-+      adr     r0, _cp15_save_diag
-       ldr     r2, [r0]
-+      ldr     r2, [r0, r2]
-       mov     r0, #SMC_CMD_C15RESUME
-       dsb
-       smc     #0
-@@ -118,14 +113,20 @@ skip_l2x0:
- skip_cp15:
-       b       cpu_resume
- ENDPROC(exynos_cpu_resume_ns)
-+
-+      .align
-+_cp15_save_power:
-+      .long   cp15_save_power - .
-+_cp15_save_diag:
-+      .long   cp15_save_diag - .
-+#ifdef CONFIG_CACHE_L2X0
-+1:    .long   l2x0_saved_regs - .
-+#endif /* CONFIG_CACHE_L2X0 */
-+
-+      .data
-       .globl cp15_save_diag
- cp15_save_diag:
-       .long   0       @ cp15 diagnostic
-       .globl cp15_save_power
- cp15_save_power:
-       .long   0       @ cp15 power control
--
--#ifdef CONFIG_CACHE_L2X0
--      .align
--1:    .long   l2x0_saved_regs - .
--#endif /* CONFIG_CACHE_L2X0 */
--- 
-cgit v0.10.2
-