summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2017-01-12 15:04:29 +0000
committerWill Deacon <will.deacon@arm.com>2017-01-12 15:04:29 +0000
commit42d1a731ffee44b16c06df371ffdbb14135c11e3 (patch)
tree8d78d86e34dfd7ec44377df098371f322c463152 /kernel
parent4aa8a472c33f4024381ade56bef008a9c566366a (diff)
parent1a08e3d9e0ac4577ba89dbdb38f593fe050f88fc (diff)
downloadop-kernel-dev-42d1a731ffee44b16c06df371ffdbb14135c11e3.zip
op-kernel-dev-42d1a731ffee44b16c06df371ffdbb14135c11e3.tar.gz
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 'kernel')
-rw-r--r--kernel/kexec_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 5617cc4..a01974e 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -1399,7 +1399,7 @@ void __weak arch_crash_save_vmcoreinfo(void)
phys_addr_t __weak paddr_vmcoreinfo_note(void)
{
- return __pa((unsigned long)(char *)&vmcoreinfo_note);
+ return __pa_symbol((unsigned long)(char *)&vmcoreinfo_note);
}
static int __init crash_save_vmcoreinfo_init(void)
OpenPOWER on IntegriCloud