Merge tag 'asoc-fix-v5.5-rc6' into asoc-5.6

[linux-2.6-block.git] / mm / sparse.c

diff --git a/mm/sparse.c b/mm/sparse.c
index 163b4d59cf6c976e3a61df2239b296dde0a46d52..b20ab7cdac867071b27c81e39cffad475851fad5 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -458,8 +458,7 @@ struct page __init *__populate_section_memmap(unsigned long pfn,
        if (map)
                return map;
 
-       map = memblock_alloc_try_nid_raw(size,
-                                         PAGE_SIZE, addr,
+       map = memblock_alloc_try_nid_raw(size, size, addr,
                                          MEMBLOCK_ALLOC_ACCESSIBLE, nid);
        if (!map)
                panic("%s: Failed to allocate %lu bytes align=0x%lx nid=%d from=%pa\n",
@@ -482,10 +481,13 @@ static void __init sparse_buffer_init(unsigned long size, int nid)
 {
        phys_addr_t addr = __pa(MAX_DMA_ADDRESS);
        WARN_ON(sparsemap_buf); /* forgot to call sparse_buffer_fini()? */
-       sparsemap_buf =
-               memblock_alloc_try_nid_raw(size, PAGE_SIZE,
-                                               addr,
-                                               MEMBLOCK_ALLOC_ACCESSIBLE, nid);
+       /*
+        * Pre-allocated buffer is mainly used by __populate_section_memmap
+        * and we want it to be properly aligned to the section size - this is
+        * especially the case for VMEMMAP which maps memmap to PMDs
+        */
+       sparsemap_buf = memblock_alloc_exact_nid_raw(size, section_map_size(),
+                                       addr, MEMBLOCK_ALLOC_ACCESSIBLE, nid);
        sparsemap_buf_end = sparsemap_buf + size;
 }