git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/objtool, to pick up dependent commits
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
mm
/
init.c
diff --git
a/arch/x86/mm/init.c
b/arch/x86/mm/init.c
index af5c1ed21d43ac651ecbe02e7a58dc7baa884168..a22c2b95e5133919e839d3c7a7a33b82b17e629c 100644
(file)
--- 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);
}