From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752480Ab2LTTQi (ORCPT ); Thu, 20 Dec 2012 14:16:38 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:49515 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752445Ab2LTTPE (ORCPT ); Thu, 20 Dec 2012 14:15:04 -0500 From: Sasha Levin To: Andrew Morton , Johannes Weiner , Michal Hocko , Gavin Shan , David Rientjes , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Sasha Levin Subject: [PATCH] mm/sparse: don't check return value of alloc_bootmem calls Date: Thu, 20 Dec 2012 14:11:38 -0500 Message-Id: <1356030701-16284-30-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1356030701-16284-1-git-send-email-sasha.levin@oracle.com> References: <1356030701-16284-1-git-send-email-sasha.levin@oracle.com> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These calls will panic if they can't allocate the memory, so we can assume that we get actual memory back. This simplifies some functions and removes unneeded checks. Signed-off-by: Sasha Levin --- mm/sparse.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/mm/sparse.c b/mm/sparse.c index 6b5fb76..ae64d6e 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -403,15 +403,13 @@ 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, PAGE_SIZE, __pa(MAX_DMA_ADDRESS)); - if (map) { - for (pnum = pnum_begin; pnum < pnum_end; pnum++) { - if (!present_section_nr(pnum)) - continue; - map_map[pnum] = map; - map += size; - } - return; + for (pnum = pnum_begin; pnum < pnum_end; pnum++) { + if (!present_section_nr(pnum)) + continue; + map_map[pnum] = map; + map += size; } + return; /* fallback */ for (pnum = pnum_begin; pnum < pnum_end; pnum++) { @@ -497,8 +495,6 @@ void __init sparse_init(void) */ size = sizeof(unsigned long *) * NR_MEM_SECTIONS; usemap_map = alloc_bootmem(size); - if (!usemap_map) - panic("can not allocate usemap_map\n"); for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) { struct mem_section *ms; @@ -538,8 +534,6 @@ void __init sparse_init(void) #ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER size2 = sizeof(struct page *) * NR_MEM_SECTIONS; map_map = alloc_bootmem(size2); - if (!map_map) - panic("can not allocate map_map\n"); for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) { struct mem_section *ms; -- 1.8.0