diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-01-12 18:04:29 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-01-12 18:04:29 +0300 |
| commit | 42d1a731ffee44b16c06df371ffdbb14135c11e3 (patch) | |
| tree | 8d78d86e34dfd7ec44377df098371f322c463152 /drivers/firmware | |
| parent | 4aa8a472c33f4024381ade56bef008a9c566366a (diff) | |
| parent | 1a08e3d9e0ac4577ba89dbdb38f593fe050f88fc (diff) | |
| download | linux-42d1a731ffee44b16c06df371ffdbb14135c11e3.tar.xz | |
Merge branch 'aarch64/for-next/debug-virtual' into aarch64/for-next/core
Merge core DEBUG_VIRTUAL changes from Laura Abbott. Later arm and arm64
support depends on these.
* aarch64/for-next/debug-virtual:
drivers: firmware: psci: Use __pa_symbol for kernel symbol
mm/usercopy: Switch to using lm_alias
mm/kasan: Switch to using __pa_symbol and lm_alias
kexec: Switch to __pa_symbol
mm: Introduce lm_alias
mm/cma: Cleanup highmem check
lib/Kconfig.debug: Add ARCH_HAS_DEBUG_VIRTUAL
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |