Merge branch 'for-4.16/nfit' into libnvdimm-for-next

This commit is contained in:
Ross Zwisler 2018-02-03 00:26:26 -07:00
commit ee95f4059a
475 changed files with 6115 additions and 1920 deletions

View file

@ -211,7 +211,7 @@ void __init memory_present(int nid, unsigned long start, unsigned long end)
if (unlikely(!mem_section)) {
unsigned long size, align;
size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
size = sizeof(struct mem_section*) * NR_SECTION_ROOTS;
align = 1 << (INTERNODE_CACHE_SHIFT);
mem_section = memblock_virt_alloc(size, align);
}