diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:22:30 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:22:30 -0700 |
| commit | a143f427f3e7c6d80bc1d288334706a1f8237f5f (patch) | |
| tree | 59e96413cf2013afb70bfaaca5f89937d9d7ac20 /arch/arm/mach-hisi/platsmp.c | |
| parent | d9e292d3ea94ab21f028108527a908e415e856ef (diff) | |
| parent | f249a14dd1b6b341e7b5e29b64c0edae6e13b7f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-15.11-rtlsk-v4.1-15.10-rtlsk-v4.1-15.09-rt
Diffstat (limited to 'arch/arm/mach-hisi/platsmp.c')
| -rw-r--r-- | arch/arm/mach-hisi/platsmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c index 8880c8e8b296..51744127db66 100644 --- a/arch/arm/mach-hisi/platsmp.c +++ b/arch/arm/mach-hisi/platsmp.c @@ -118,7 +118,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle) { phys_addr_t jumpaddr; - jumpaddr = virt_to_phys(hisi_secondary_startup); + jumpaddr = virt_to_phys(secondary_startup); hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr); hix5hd2_set_cpu(cpu, true); arch_send_wakeup_ipi_mask(cpumask_of(cpu)); @@ -156,7 +156,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle) struct device_node *node; - jumpaddr = virt_to_phys(hisi_secondary_startup); + jumpaddr = virt_to_phys(secondary_startup); hip01_set_boot_addr(HIP01_BOOT_ADDRESS, jumpaddr); node = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl"); |