ARM: sunxi: fix build for THUMB2_KERNEL
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>
This commit is contained in:
Родитель
96c3a2506b
Коммит
1146b60004
|
@ -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);
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
obj-$(CONFIG_ARCH_SUNXI) += sunxi.o
|
||||
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
|
||||
obj-$(CONFIG_SMP) += platsmp.o
|
||||
|
|
|
@ -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)
|
|
@ -82,7 +82,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu,
|
|||
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 */
|
||||
|
|
Загрузка…
Ссылка в новой задаче