From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 13 Aug 2015 21:12:51 +0000 (-0700)
Subject: 3.14-stable patches
X-Git-Tag: v3.10.87~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f38b88ce6911d10b8ff8e3da18f520097b45b82c;p=thirdparty%2Fkernel%2Fstable-queue.git

3.14-stable patches

added patches:
	arm-sunxi-fix-build-for-thumb2_kernel.patch
---

diff --git a/queue-3.14/arm-sunxi-fix-build-for-thumb2_kernel.patch b/queue-3.14/arm-sunxi-fix-build-for-thumb2_kernel.patch
new file mode 100644
index 00000000000..2e78f12ba04
--- /dev/null
+++ b/queue-3.14/arm-sunxi-fix-build-for-thumb2_kernel.patch
@@ -0,0 +1,70 @@
+From 1146b600044de64af0ef775025731eeef1fa2189 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Sun, 16 Mar 2014 18:04:54 +0100
+Subject: ARM: sunxi: fix build for THUMB2_KERNEL
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 1146b600044de64af0ef775025731eeef1fa2189 upstream.
+
+Building an SMP kernel for the sunxi platform with THUMB2 instructions
+fails with this error at the moment:
+
+headsmp.S:7: Error: Thumb encoding does not support an immediate here -- `msr cpsr_fsxc,#0xd3'
+
+Since the generic secondary_startup function already does
+the same thing in a safe way, we can just drop the private
+sunxi implementation and jump straight to secondary_startup.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Kevin Hilman <khilman@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ arch/arm/include/asm/smp.h    |    1 +
+ arch/arm/mach-sunxi/Makefile  |    2 +-
+ arch/arm/mach-sunxi/headsmp.S |    9 ---------
+ arch/arm/mach-sunxi/platsmp.c |    2 +-
+ 4 files changed, 3 insertions(+), 11 deletions(-)
+
+--- a/arch/arm/include/asm/smp.h
++++ b/arch/arm/include/asm/smp.h
+@@ -74,6 +74,7 @@ struct secondary_data {
+ };
+ extern struct secondary_data secondary_data;
+ extern volatile int pen_release;
++extern void secondary_startup(void);
+ 
+ extern int __cpu_disable(void);
+ 
+--- a/arch/arm/mach-sunxi/Makefile
++++ b/arch/arm/mach-sunxi/Makefile
+@@ -1,2 +1,2 @@
+ obj-$(CONFIG_ARCH_SUNXI) += sunxi.o
+-obj-$(CONFIG_SMP) += platsmp.o headsmp.o
++obj-$(CONFIG_SMP) += platsmp.o
+--- a/arch/arm/mach-sunxi/headsmp.S
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#include <linux/linkage.h>
+-#include <linux/init.h>
+-
+-        .section ".text.head", "ax"
+-
+-ENTRY(sun6i_secondary_startup)
+-	msr	cpsr_fsxc, #0xd3
+-	b	secondary_startup
+-ENDPROC(sun6i_secondary_startup)
+--- a/arch/arm/mach-sunxi/platsmp.c
++++ b/arch/arm/mach-sunxi/platsmp.c
+@@ -82,7 +82,7 @@ static int sun6i_smp_boot_secondary(unsi
+ 	spin_lock(&cpu_lock);
+ 
+ 	/* Set CPU boot address */
+-	writel(virt_to_phys(sun6i_secondary_startup),
++	writel(virt_to_phys(secondary_startup),
+ 	       cpucfg_membase + CPUCFG_PRIVATE0_REG);
+ 
+ 	/* Assert the CPU core in reset */
diff --git a/queue-3.14/series b/queue-3.14/series
index afd473ce99f..68a251d8104 100644
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -12,3 +12,4 @@ usb-sierra-add-1199-68ab-device-id.patch
 ima-add-support-for-new-euid-policy-condition.patch
 ima-extend-mask-policy-matching-support.patch
 md-use-kzalloc-when-bitmap-is-disabled.patch
+arm-sunxi-fix-build-for-thumb2_kernel.patch