diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-18 12:36:53 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-18 12:36:53 +0300 |
| commit | 1ed7d32763857fbdc8e406352404538e41050d22 (patch) | |
| tree | f97c5d8f548141bf7cdec0a9d7f22adb61da6efc /arch/x86/xen/mmu_pv.c | |
| parent | 660da7c9228f685b2ebe664f9fd69aaddcc420b5 (diff) | |
| parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
| download | linux-1ed7d32763857fbdc8e406352404538e41050d22.tar.xz | |
Merge branch 'x86/boot' into x86/mm, to pick up interacting changes
The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/xen/mmu_pv.c')
| -rw-r--r-- | arch/x86/xen/mmu_pv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 0472790ec20b..e437714750f8 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -2692,8 +2692,8 @@ EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region); phys_addr_t paddr_vmcoreinfo_note(void) { if (xen_pv_domain()) - return virt_to_machine(&vmcoreinfo_note).maddr; + return virt_to_machine(vmcoreinfo_note).maddr; else - return __pa_symbol(&vmcoreinfo_note); + return __pa(vmcoreinfo_note); } #endif /* CONFIG_KEXEC_CORE */ |