]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: socfpga: fix build error due to secondary_startup
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 22:41:58 +0000 (15:41 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 22:41:58 +0000 (15:41 -0700)
After commit 02b4e2756e01 (ARM: v7 setup function should invalidate L1
cache) the soc specific secondary_startup is removed, causing build
failures:

../arch/arm/mach-socfpga/platsmp.c: In function 'socfpga_a10_boot_secondary':
../arch/arm/mach-socfpga/platsmp.c:66:140: error: 'socfpga_secondary_startup' undeclared (first use in this function)
../arch/arm/mach-socfpga/platsmp.c:66:140: note: each undeclared identifier is reported only once for each function it appears in

To fix, use the generic secondary_startup.

Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/mach-socfpga/platsmp.c

index 5454e9ce31ead47a83fe3b202c4b4fbcf104c500..7ed61279332363438a92f7e7a1d87d4681129b87 100644 (file)
@@ -63,7 +63,7 @@ static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle
                       SOCFPGA_A10_RSTMGR_MODMPURST);
                memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
 
-               writel(virt_to_phys(socfpga_secondary_startup),
+               writel(virt_to_phys(secondary_startup),
                       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
 
                flush_cache_all();