diff options
-rw-r--r-- | include/linux/bootmem.h | 4 | ||||
-rw-r--r-- | mm/sparse.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 7d91f0f5ee44..3896af205303 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h | |||
@@ -157,9 +157,9 @@ static inline void * __init memblock_alloc_from_nopanic( | |||
157 | } | 157 | } |
158 | 158 | ||
159 | static inline void * __init memblock_alloc_node( | 159 | static inline void * __init memblock_alloc_node( |
160 | phys_addr_t size, int nid) | 160 | phys_addr_t size, phys_addr_t align, int nid) |
161 | { | 161 | { |
162 | return memblock_alloc_try_nid(size, 0, BOOTMEM_LOW_LIMIT, | 162 | return memblock_alloc_try_nid(size, align, BOOTMEM_LOW_LIMIT, |
163 | BOOTMEM_ALLOC_ACCESSIBLE, nid); | 163 | BOOTMEM_ALLOC_ACCESSIBLE, nid); |
164 | } | 164 | } |
165 | 165 | ||
diff --git a/mm/sparse.c b/mm/sparse.c index cb900dda7fd2..d1296610562b 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -68,7 +68,7 @@ static noinline struct mem_section __ref *sparse_index_alloc(int nid) | |||
68 | if (slab_is_available()) | 68 | if (slab_is_available()) |
69 | section = kzalloc_node(array_size, GFP_KERNEL, nid); | 69 | section = kzalloc_node(array_size, GFP_KERNEL, nid); |
70 | else | 70 | else |
71 | section = memblock_alloc_node(array_size, nid); | 71 | section = memblock_alloc_node(array_size, 0, nid); |
72 | 72 | ||
73 | return section; | 73 | return section; |
74 | } | 74 | } |