aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-12-05 14:22:54 +0800
committerAlex Shi <alex.shi@linaro.org>2014-12-05 14:22:54 +0800
commitd060b08b77e1f84e5b43e2c23677e56ad3427a49 (patch)
tree9032a9609eb545bc7845f9980c7d338858159a3e
parent8f7d7c6e57ee4a20667573c7f73a434c7f97c060 (diff)
arm/smp: remove __cpuinit attr from __cpu_up/boot_secondary
To sync up with upstream code and resolve mismatch section issue. Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm/kernel/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 180200e3dc9..7dc1cdda9dd 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -84,7 +84,7 @@ void __init smp_set_ops(struct smp_operations *ops)
smp_ops = *ops;
};
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
int ret;
@@ -131,7 +131,7 @@ void __init smp_init_cpus(void)
smp_ops.smp_init_cpus();
}
-int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+int boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (smp_ops.smp_boot_secondary)
return smp_ops.smp_boot_secondary(cpu, idle);