diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
| commit | 57957fb519449803df30d10da433c27aaad17fa5 (patch) | |
| tree | b7cf0ca9f4f8f630128afbc29de34cab93e50fa5 /mm/sparse.c | |
| parent | a9445e47d897054876b8f43e46dc5a3eca2b844d (diff) | |
| parent | ed4bbf7910b28ce3c691aef28d245585eaabda06 (diff) | |
Merge branch 'timers/urgent' into timers/core, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 7a5dacaa06e3..2609aba121e8 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) 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); } |