diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 13:02:26 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 13:02:26 +0300 |
| commit | 1ccb2f4e8e435a53bb378e8b092087f091754aa6 (patch) | |
| tree | ba120509947138915e06ad39cca5f065bd99f42f /arch/arm/mach-mvebu/platsmp.c | |
| parent | c3a3800fe46f00ceeeb181cc07cc4fdaed4574f1 (diff) | |
| parent | 9b231d9f47c6114d317ce28cff92a74ad80547f5 (diff) | |
| download | linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-mvebu/platsmp.c')
| -rw-r--r-- | arch/arm/mach-mvebu/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c index e62273aacb43..4ffbbd217e82 100644 --- a/arch/arm/mach-mvebu/platsmp.c +++ b/arch/arm/mach-mvebu/platsmp.c @@ -211,7 +211,7 @@ static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr) return PTR_ERR(base); writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG); - writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG); + writel(__pa_symbol(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG); iounmap(base); |