diff options
| author |   Kevin Hilman <khilman@linaro.org> | 2015-06-11 15:50:10 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 15:50:10 -0700 |
| commit | 259f47eb4411c2e7f50372bb388c074d5729cca2 (patch) | |
| tree | 66a9cc6eae9468ac31541e8346d7479aa524b4d5 | |
| parent | MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS (diff) | |
| parent | ARM: socfpga: fix build error due to secondary_startup (diff) | |
| download | wireguard-linux-259f47eb4411c2e7f50372bb388c074d5729cca2.tar.xz wireguard-linux-259f47eb4411c2e7f50372bb388c074d5729cca2.zip | |
Merge branch 'socfpga/soc' into next/soc
* socfpga/soc:
ARM: socfpga: fix build error due to secondary_startup
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-socfpga/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c index 5454e9ce31ea..7ed612793323 100644 --- a/arch/arm/mach-socfpga/platsmp.c +++ b/arch/arm/mach-socfpga/platsmp.c @@ -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(); |