diff options
Diffstat (limited to 'mm/sparse.c')
-rw-r--r-- | mm/sparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index d1296610562b..b139fbc61d10 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
7 | #include <linux/mmzone.h> | 7 | #include <linux/mmzone.h> |
8 | #include <linux/bootmem.h> | 8 | #include <linux/bootmem.h> |
9 | #include <linux/memblock.h> | ||
9 | #include <linux/compiler.h> | 10 | #include <linux/compiler.h> |
10 | #include <linux/highmem.h> | 11 | #include <linux/highmem.h> |
11 | #include <linux/export.h> | 12 | #include <linux/export.h> |
@@ -393,7 +394,7 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid, | |||
393 | 394 | ||
394 | map = memblock_alloc_try_nid(size, | 395 | map = memblock_alloc_try_nid(size, |
395 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), | 396 | PAGE_SIZE, __pa(MAX_DMA_ADDRESS), |
396 | BOOTMEM_ALLOC_ACCESSIBLE, nid); | 397 | MEMBLOCK_ALLOC_ACCESSIBLE, nid); |
397 | return map; | 398 | return map; |
398 | } | 399 | } |
399 | #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ | 400 | #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ |
@@ -407,7 +408,7 @@ static void __init sparse_buffer_init(unsigned long size, int nid) | |||
407 | sparsemap_buf = | 408 | sparsemap_buf = |
408 | memblock_alloc_try_nid_raw(size, PAGE_SIZE, | 409 | memblock_alloc_try_nid_raw(size, PAGE_SIZE, |
409 | __pa(MAX_DMA_ADDRESS), | 410 | __pa(MAX_DMA_ADDRESS), |
410 | BOOTMEM_ALLOC_ACCESSIBLE, nid); | 411 | MEMBLOCK_ALLOC_ACCESSIBLE, nid); |
411 | sparsemap_buf_end = sparsemap_buf + size; | 412 | sparsemap_buf_end = sparsemap_buf + size; |
412 | } | 413 | } |
413 | 414 | ||