diff options
| author |   Yingjoe Chen <yingjoe.chen@mediatek.com> | 2015-05-18 09:04:31 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-02 09:58:16 +0100 |
| commit | c07b5fd0268fc2bbaa584548d437f763d20bde77 (patch) | |
| tree | 242bc30d43607dfb426fea6559f770d93366a51f /arch/arm/kernel/head.S | |
| parent | ARM: l2c: avoid passing auxiliary control register through enable method (diff) | |
| download | linux-dev-c07b5fd0268fc2bbaa584548d437f763d20bde77.tar.xz linux-dev-c07b5fd0268fc2bbaa584548d437f763d20bde77.zip | |
ARM: 8359/1: correct secondary_startup_arm mode
secondary_startup_arm is used as ARM mode secondary start up function
when ther kernel is compiled in THUMB mode, however the label itself
is still in .thumb mode. readelf shows:
160979: c020a581 120 FUNC GLOBAL DEFAULT 2 secondary_startup_arm
Make sure the label is in ARM mode as well.
Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
Tested-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/head.S')
| -rw-r--r-- | arch/arm/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 3637973a9708..58ee8a24308c 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -346,8 +346,8 @@ __turn_mmu_on_loc: #if defined(CONFIG_SMP) .text -ENTRY(secondary_startup_arm) .arm +ENTRY(secondary_startup_arm) THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM. THUMB( bx r9 ) @ If this is a Thumb-2 kernel, THUMB( .thumb ) @ switch to Thumb now. |