diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-01 10:34:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:50:01 +0100 |
| commit | e5d77a73f364ba0e3e3d6c72c334324bb12e04fc (patch) | |
| tree | a3feefe8605f022dd974fbaddb10c7b992c58408 /arch/x86/mm | |
| parent | 2ec077c186a02c0aae8fc213a7b1d4c35f9626ed (diff) | |
| parent | 03b2a320b19f1424e9ac9c21696be9c60b6d0d93 (diff) | |
| download | linux-e5d77a73f364ba0e3e3d6c72c334324bb12e04fc.tar.bz2 | |
Merge commit 'upstream-x86-virt' into WIP.x86/mm
Merge a minimal set of virt cleanups, for a base for the MM isolation patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index af5c1ed21d43..a22c2b95e513 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -671,7 +671,7 @@ void __init init_mem_mapping(void) load_cr3(swapper_pg_dir); __flush_tlb_all(); - hypervisor_init_mem_mapping(); + x86_init.hyper.init_mem_mapping(); early_memtest(0, max_pfn_mapped << PAGE_SHIFT); } |