From: Felix Fu fuzhen5@huawei.com
Offering: HULK hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881
-----------------------------------------
This reverts commit 566438a9042ff74e7e0aea862445084615057632.
Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/mach-spear/headsmp.S | 11 ++++++++--- arch/arm/mach-versatile/headsmp.S | 9 ++++++++- 2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-spear/headsmp.S b/arch/arm/mach-spear/headsmp.S index 32ffc75ff332..96f89436ccf6 100644 --- a/arch/arm/mach-spear/headsmp.S +++ b/arch/arm/mach-spear/headsmp.S @@ -10,8 +10,6 @@ #include <linux/linkage.h> #include <linux/init.h>
-#include <asm/assembler.h> - __INIT
/* @@ -22,7 +20,10 @@ ENTRY(spear13xx_secondary_startup) mrc p15, 0, r0, c0, c0, 5 and r0, r0, #15 - adr_l r6, spear_pen_release + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 pen: ldr r7, [r6] cmp r7, r0 bne pen @@ -36,4 +37,8 @@ pen: ldr r7, [r6] * should now contain the SVC stack for this core */ b secondary_startup + + .align +1: .long . + .long spear_pen_release ENDPROC(spear13xx_secondary_startup) diff --git a/arch/arm/mach-versatile/headsmp.S b/arch/arm/mach-versatile/headsmp.S index ce925e9059c5..99c32db412ae 100644 --- a/arch/arm/mach-versatile/headsmp.S +++ b/arch/arm/mach-versatile/headsmp.S @@ -16,7 +16,10 @@ ENTRY(versatile_secondary_startup) ARM_BE8(setend be) mrc p15, 0, r0, c0, c0, 5 bic r0, #0xff000000 - adr_l r6, versatile_cpu_release + adr r4, 1f + ldmia r4, {r5, r6} + sub r4, r4, r5 + add r6, r6, r4 pen: ldr r7, [r6] cmp r7, r0 bne pen @@ -26,4 +29,8 @@ pen: ldr r7, [r6] * should now contain the SVC stack for this core */ b secondary_startup + + .align +1: .long . + .long versatile_cpu_release ENDPROC(versatile_secondary_startup)