diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 02:26:26 -0500 |
|---|---|---|
| committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 02:26:26 -0500 |
| commit | ee95f4059a833839bf52972191b2d4c3d3cec552 (patch) | |
| tree | a1c8587d9b82e64a75dde376a90a3d69b0f4847a /mm/sparse.c | |
| parent | d121f07691415df824e6b60520f782f6d13b3c81 (diff) | |
| parent | f81e1d35a6e36d30888c46283b8dd1022e847124 (diff) | |
Merge branch 'for-4.16/nfit' into libnvdimm-for-next
Diffstat (limited to 'mm/sparse.c')
| -rw-r--r-- | mm/sparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index 06130c13dc99..2583174b1d62 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -211,7 +211,7 @@ void __init memory_present(int nid, unsigned long start, unsigned long end) | |||
| 211 | if (unlikely(!mem_section)) { | 211 | if (unlikely(!mem_section)) { |
| 212 | unsigned long size, align; | 212 | unsigned long size, align; |
| 213 | 213 | ||
| 214 | size = sizeof(struct mem_section) * NR_SECTION_ROOTS; | 214 | size = sizeof(struct mem_section*) * NR_SECTION_ROOTS; |
| 215 | align = 1 << (INTERNODE_CACHE_SHIFT); | 215 | align = 1 << (INTERNODE_CACHE_SHIFT); |
| 216 | mem_section = memblock_virt_alloc(size, align); | 216 | mem_section = memblock_virt_alloc(size, align); |
| 217 | } | 217 | } |