projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/bootmem
[cascardo/linux.git]
/
arch
/
x86
/
mm
/
srat_64.c
diff --git
a/arch/x86/mm/srat_64.c
b/arch/x86/mm/srat_64.c
index
603d285
..
4c03e13
100644
(file)
--- a/
arch/x86/mm/srat_64.c
+++ b/
arch/x86/mm/srat_64.c
@@
-444,6
+444,8
@@
int __init acpi_scan_nodes(unsigned long start, unsigned long end)
return -1;
}
+ init_memory_mapping_high();
+
/* Account for nodes with cpus and no memory */
nodes_or(node_possible_map, nodes_parsed, cpu_nodes_parsed);