diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:59 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:59 +0200 |
| commit | a9dd3865dd1bd996a7e6af808645b7e566ced009 (patch) | |
| tree | 4a11fe3663f1e7c375bb8d33af85d8b1ad5e5ad5 /arch/arm/mach-zynq/platsmp.c | |
| parent | Merge branch 'devel-stable' into for-next (diff) | |
| parent | ARM: fix EFM32 build breakage caused by cpu_resume_arm (diff) | |
| download | linux-a9dd3865dd1bd996a7e6af808645b7e566ced009.tar.xz linux-a9dd3865dd1bd996a7e6af808645b7e566ced009.zip | |
Merge branch 'for-arm-soc' into for-next
Diffstat (limited to 'arch/arm/mach-zynq/platsmp.c')
| -rw-r--r-- | arch/arm/mach-zynq/platsmp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c index 52d768ff7857..f66816c49186 100644 --- a/arch/arm/mach-zynq/platsmp.c +++ b/arch/arm/mach-zynq/platsmp.c @@ -87,10 +87,9 @@ int zynq_cpun_start(u32 address, int cpu) } EXPORT_SYMBOL(zynq_cpun_start); -static int zynq_boot_secondary(unsigned int cpu, - struct task_struct *idle) +static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle) { - return zynq_cpun_start(virt_to_phys(zynq_secondary_startup), cpu); + return zynq_cpun_start(virt_to_phys(secondary_startup), cpu); } /* |