Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3391985imu; Mon, 24 Dec 2018 00:41:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN7s4Jk2acT4E0FmzX5D4C7Vh8NIyldvk1f3iU2NdmYTySUvYJt5UU8cem5HNxU8nsFZq7bE X-Received: by 2002:a63:1e17:: with SMTP id e23mr11537669pge.130.1545640861621; Mon, 24 Dec 2018 00:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545640861; cv=none; d=google.com; s=arc-20160816; b=npE12nbyglIsgSZYxBbAgPcqkGOWREmLiGZ0c1CQBJyJ2mQidlupxshLOc8gvgCQPl ZFERZHJPCA0/i793F4uvmP3s27z4Y4QT2kBu3XaXDdt6DcpBPdsyB0lRZc1T4f8SvU2r Mr/65LhtfdPjE6+xRM8nFEa4lYTmHdrk685mQk4vappzhqybpfxBCd05QQcbNJlx8xVz 8zYZCH9vk1LDogIC6D9LuU47wxrG5r8+jjjzQbQ02oAsxcnDP0hjorlM8M6/9e54RGqr 7ORye+2pwVN59LwbHi2Y8RG2/Vjt/3359l1QyvYvFu0/1+axcvsMHLyK0R95NfS66ob7 NDxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=Yi1Q1KGiNgo2sRJDe6278IZNJtuxKkjvNCfxbdF94XE=; b=a4Tc87Tp2W92M+RuBiZDCKjOfMcMYsQEoCran6u1xEi2XbtNBfydSZFhw+2FO6WeOw 7eqatOlvmSDDUP4zOGu4BdWF4TAXGxCczWSpSs4Nlrf5sQUMg539AvWwTHyCEcY8S/nJ Iijp93L4XQgao4pjt66axL34QF4Hfm7W/bZ3+jGo4pIIZ7Pzm3yNE1ChybLKSbud7TUi mdWRVeGvMqRAG2RDPYyVFrPwEipIbhp0H/rTJHLNxL9tmcFIDEE6YlWftNYhwRGl9Jls O+zjp4pQdBafy5bAXFlz/mcjFacTkw3UGVOtWK5PJQa1aDZZmq6Ebjy2NuRM/3ZdQiu6 YioA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n13si27556586pgp.307.2018.12.24.00.40.46; Mon, 24 Dec 2018 00:41:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726873AbeLXIiX (ORCPT + 99 others); Mon, 24 Dec 2018 03:38:23 -0500 Received: from mxhk.zte.com.cn ([63.217.80.70]:50510 "EHLO mxhk.zte.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726788AbeLXIiX (ORCPT ); Mon, 24 Dec 2018 03:38:23 -0500 Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 926116C62F04F176CF32; Mon, 24 Dec 2018 16:38:18 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id wBO8cAOr059116; Mon, 24 Dec 2018 16:38:10 +0800 (GMT-8) (envelope-from huang.zijiang@zte.com.cn) Received: from fox-host8.localdomain ([10.74.120.8]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018122416381705-18426314 ; Mon, 24 Dec 2018 16:38:17 +0800 From: "huang.zijiang" To: akpm@linux-foundation.org Cc: rppt@linux.vnet.ibm.com, mhocko@suse.com, sfr@canb.auug.org.au, mpe@ellerman.id.au, linux-kernel@vger.kernel.org, xue.zhihong@zte.com.cn, wang.yi59@zte.com.cn, "huang.zijiang" Subject: [PATCH] firmware/memmap:Modify memblock_alloc to memblock_alloc_nopanic Date: Mon, 24 Dec 2018 16:41:22 +0800 Message-Id: <1545640882-42009-1-git-send-email-huang.zijiang@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-12-24 16:38:17, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-12-24 16:38:10, Serialize complete at 2018-12-24 16:38:10 X-MAIL: mse01.zte.com.cn wBO8cAOr059116 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "huang.zijiang" memblock_alloc never returns NULL because panic never returns Signed-off-by: huang.zijiang --- drivers/firmware/memmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index d168c87..ec4fd25 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c @@ -333,7 +333,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type) { struct firmware_map_entry *entry; - entry = memblock_alloc(sizeof(struct firmware_map_entry), + entry = memblock_alloc_nopanic(sizeof(struct firmware_map_entry), SMP_CACHE_BYTES); if (WARN_ON(!entry)) return -ENOMEM; -- 1.8.3.1