Patch "ARM: sunxi: fix build for THUMB2_KERNEL" has been added to the 3.14-stable tree
This is a note to let you know that I've just added the patch titled
ARM: sunxi: fix build for THUMB2_KERNEL
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-sunxi-fix-build-for-thumb2_kernel.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
1146b600044de64af0ef775025731eeef1fa2189Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Sun, 16 Mar 2014 18:04:54 +0100
Subject: ARM: sunxi: fix build for THUMB2_KERNEL
From: Arnd Bergmann <[email protected]>
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.
--- 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(-)
arch/arm/include/asm/smp.h +1 -0
@@ -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 );
arch/arm/mach-sunxi/Makefile +1 -1
@@ -1,2 +1,2 @@ obj-$(CONFIG_ARCH_SUNXI) += sunxi.o -obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_SMP) += platsmp.o
arch/arm/mach-sunxi/headsmp.S deleted +0 -9
@@ -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)
arch/arm/mach-sunxi/platsmp.c +1 -1
@@ -82,7 +82,7 @@ static int sun6i_smp_boot_secondary(unsispin_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 */
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/arm-realview-fix-sparsemem-build.patch queue-3.14/arm-sunxi-fix-build-for-thumb2_kernel.patch