diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-01-17 16:42:47 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-06-16 14:12:21 -0400 |
commit | ff6138ad196d7591d07d4c465c03e90dd86d61db (patch) | |
tree | 1e181529e6068cdc30f3244c79ffcda39e31833f | |
parent | 02d6e63307325aeadf5af0ed7371d1acb261b775 (diff) |
arm/mach-mvebu: remove legacy __cpuinit sections that crept in
We removed __cpuinit support (leaving no-op stubs) quite some time
ago. However these ones crept back in as of commit 1ee89e2231a1b04dc3476
("ARM: mvebu: add SMP support for Armada 375 and Armada 38x")
Since we want to clobber the stubs soon, get this removed now.
Note that there would normally be a corresponding removal of
a ".previous" directive for each __CPUINIT in asm files, but in
this case it appears that this single function file was never
paired off with one.
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | arch/arm/mach-mvebu/headsmp-a9.S | 3 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/platsmp-a9.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-mvebu/headsmp-a9.S b/arch/arm/mach-mvebu/headsmp-a9.S index 08d5ed46b996..f6a1b5b153af 100644 --- a/arch/arm/mach-mvebu/headsmp-a9.S +++ b/arch/arm/mach-mvebu/headsmp-a9.S | |||
@@ -13,12 +13,9 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <linux/init.h> | ||
17 | 16 | ||
18 | #include <asm/assembler.h> | 17 | #include <asm/assembler.h> |
19 | 18 | ||
20 | __CPUINIT | ||
21 | |||
22 | ENTRY(mvebu_cortex_a9_secondary_startup) | 19 | ENTRY(mvebu_cortex_a9_secondary_startup) |
23 | ARM_BE8(setend be) | 20 | ARM_BE8(setend be) |
24 | bl v7_invalidate_l1 | 21 | bl v7_invalidate_l1 |
diff --git a/arch/arm/mach-mvebu/platsmp-a9.c b/arch/arm/mach-mvebu/platsmp-a9.c index df0a9cc5da59..3d5000481c11 100644 --- a/arch/arm/mach-mvebu/platsmp-a9.c +++ b/arch/arm/mach-mvebu/platsmp-a9.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | extern void mvebu_cortex_a9_secondary_startup(void); | 25 | extern void mvebu_cortex_a9_secondary_startup(void); |
26 | 26 | ||
27 | static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu, | 27 | static int mvebu_cortex_a9_boot_secondary(unsigned int cpu, |
28 | struct task_struct *idle) | 28 | struct task_struct *idle) |
29 | { | 29 | { |
30 | int ret, hw_cpu; | 30 | int ret, hw_cpu; |