diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:19:52 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:19:52 +0100 |
commit | 4210606b19852dce52ed1a687db816695b6048e1 (patch) | |
tree | fd0762f88dc54560d87fc1e523741d92228f6a9c /arch/arm/mach-zynq/platsmp.c | |
parent | 4d8cfa4642f7d8fafa4d60f05dd34fe8c3b9fa45 (diff) | |
parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'arch/arm/mach-zynq/platsmp.c')
-rw-r--r-- | arch/arm/mach-zynq/platsmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index 023f225493f..689fbbc3d9c 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -30,11 +30,11 @@ /* * Store number of cores in the system * Because of scu_get_core_count() must be in __init section and can't - * be called from zynq_cpun_start() because it is in __cpuinit section. + * be called from zynq_cpun_start() because it is not in __init section. */ static int ncores; -int __cpuinit zynq_cpun_start(u32 address, int cpu) +int zynq_cpun_start(u32 address, int cpu) { u32 trampoline_code_size = &zynq_secondary_trampoline_end - &zynq_secondary_trampoline; @@ -92,7 +92,7 @@ int __cpuinit zynq_cpun_start(u32 address, int cpu) } EXPORT_SYMBOL(zynq_cpun_start); -static int __cpuinit zynq_boot_secondary(unsigned int cpu, +static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle) { return zynq_cpun_start(virt_to_phys(secondary_startup), cpu); |