[PATCH 1/3] mm, sparse: allocate bootmem without panicing in sparse_mem_maps_populate_node

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



__alloc_bootmem_node_high() would panic if it failed allocating, so the fallback
would never get reached. Switch to using __alloc_bootmem_node_high_nopanic().

Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
---
 mm/sparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/sparse.c b/mm/sparse.c
index 6b5fb76..72a0db6 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -401,7 +401,7 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,
 	}
 
 	size = PAGE_ALIGN(size);
-	map = __alloc_bootmem_node_high(NODE_DATA(nodeid), size * map_count,
+	map = __alloc_bootmem_node_high_nopanic(NODE_DATA(nodeid), size * map_count,
 					 PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
 	if (map) {
 		for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
-- 
1.8.0

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>


[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]