From: Laura Abbott <labbott@redhat.com>
Date: Tue, 10 Jan 2017 21:35:46 +0000 (-0800)
Subject: drivers: firmware: psci: Use __pa_symbol for kernel symbol
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a08e3d9e0ac4577ba89dbdb38f593fe050f88fc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

drivers: firmware: psci: Use __pa_symbol for kernel symbol

__pa_symbol is technically the macro that should be used for kernel
symbols. Switch to this as a pre-requisite for DEBUG_VIRTUAL which
will do bounds checking.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index 6c60a5087caf..66a8793f3b37 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -383,7 +383,7 @@ static int psci_suspend_finisher(unsigned long index)
 	u32 *state = __this_cpu_read(psci_power_state);
 
 	return psci_ops.cpu_suspend(state[index - 1],
-				    virt_to_phys(cpu_resume));
+				    __pa_symbol(cpu_resume));
 }
 
 int psci_cpu_suspend_enter(unsigned long index)