diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-07-31 11:37:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-01 14:41:40 +0100 |
| commit | 2449189bb7c73b5fe55a18bc0d289e39bdcd4998 (patch) | |
| tree | b08b351d40c3bce213de0fc56b1b73637b8683c4 /arch | |
| parent | 44424c34049f41123a3a8b4853822f47f4ff03a2 (diff) | |
| download | linux-stable-2449189bb7c73b5fe55a18bc0d289e39bdcd4998.tar.gz linux-stable-2449189bb7c73b5fe55a18bc0d289e39bdcd4998.tar.bz2 linux-stable-2449189bb7c73b5fe55a18bc0d289e39bdcd4998.zip | |
ARM: Add .text annotations where required after __CPUINIT removal
Commit 8bd26e3a7 (arm: delete __cpuinit/__CPUINIT usage from all ARM
users) caused some code to leak into sections which are discarded
through the removal of __CPUINIT annotations. Add appropriate .text
annotations to bring these back into the kernel text.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/head.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index b361de143756..14235ba64a90 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -87,6 +87,7 @@ ENTRY(stext) ENDPROC(stext) #ifdef CONFIG_SMP + .text ENTRY(secondary_startup) /* * Common entry point for secondary CPUs. diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 9cf6063020ae..2c7cc1e03473 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -343,6 +343,7 @@ __turn_mmu_on_loc: .long __turn_mmu_on_end #if defined(CONFIG_SMP) + .text ENTRY(secondary_startup) /* * Common entry point for secondary CPUs. |