Commit 259f47eb authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'socfpga/soc' into next/soc 

* socfpga/soc:
  ARM: socfpga: fix build error due to secondary_startup
parents d97236e6 89b8da06

arch/arm/mach-socfpga/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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();