Received: by 2002:a25:5b86:0:0:0:0:0 with SMTP id p128csp459229ybb; Thu, 28 Mar 2019 06:05:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzw576uvrK7XhAoVP6OoTO5m8nNxW/9Idibst77JasMmTeBFQK+0WPIRoVHXMse1fWQDzxM X-Received: by 2002:a63:c06:: with SMTP id b6mr40089055pgl.440.1553778336317; Thu, 28 Mar 2019 06:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553778336; cv=none; d=google.com; s=arc-20160816; b=bYbf1X1YSvzAOc0WqtwhMLGiPGwP1eHatDy1pvj6T3vLdCnJift9eTd0v/M8AVO8da mJDg9d4SmL4VmxC2a7hYwycDemV9Nmme75O8W9j7gFfuGPKrMNSHPzreX3Al1h34gDpS IU0Dudmet029jB8S4B6M+cMb11vwGT8p7R2G4GdSSqRQe5EUZgtV0TZs3BVIxuLUeFwA 8jQrQpikKDg8LIP9VhTSqTv/Gy9ILLZevFzZN+8RtJqd8aEk0d5dmAVEeilAhDwGgVFr mBvkpvJ+cJGIHlOgwtmfz1ZBN14lojOiBawNDXVkfjt7/TBQYiH7cac46OVcsR1OslgW qw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=00mcQBSgYO78zRbK1rxCu3YRaTtOXke+6rL37WP4sfQ=; b=JMNW8LZF0MzKgYk7HMqLoconLQIAAoPoExSK4RgXfXg6hSRNDPoOEy3Ngk/as0jkHa CTFCYkD3gbm7lNjMmjqsw7nOfKYsb0pFhXABhftc4bOXDfjgTwBM6q1VFQ2uxFSqlcnL yD5IRZy3BWFGeSZNgoRPue1tmV2neYUFlfP6ZCA72z2JTDYgTu7jvFyLO5NhguUCpgfe iF2BPYzJz13E9bwk+vXQLeWancVS325undnHT6zWWufdjE2bkcB/TvFMfGBBkOCWO7bc 4wz89Og+BBQflTe9YKzDtK2P8ioy+r5J3OxX9SyCjl0gzQmOmtWuP9bk4y0cq8Akh48q vQgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=cO0bmT8R; 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 h11si10481204pgp.391.2019.03.28.06.05.17; Thu, 28 Mar 2019 06:05:36 -0700 (PDT) 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; dkim=pass header.i=@c-s.fr header.s=mail header.b=cO0bmT8R; 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 S1727181AbfC1NDs (ORCPT + 99 others); Thu, 28 Mar 2019 09:03:48 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:43892 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725779AbfC1NDs (ORCPT ); Thu, 28 Mar 2019 09:03:48 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44VQ6T3VDvz9v2Hk; Thu, 28 Mar 2019 14:03:45 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=cO0bmT8R; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id TO4ir2j_GK_q; Thu, 28 Mar 2019 14:03:45 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44VQ6T2PVRz9v2Hh; Thu, 28 Mar 2019 14:03:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1553778225; bh=00mcQBSgYO78zRbK1rxCu3YRaTtOXke+6rL37WP4sfQ=; h=From:Subject:To:Cc:Date:From; b=cO0bmT8R9gNu3H0ngv5FyHtJVZSCuSKi3egXxjfdOVGSjBTBlz4WsqnpNw/CjFEG2 u2B4b7FESvoP56Y4DzYRh7ktlp2iSEPlXSw6XY3Htukey+FR1nlGq9Fyks86e0tDMI Sguy7WJU6PIlXq65+SLc4Ck2C5Ihs4oXc5axe+wU= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A57C38B91B; Thu, 28 Mar 2019 14:03:46 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id yWcfnxQcHxZd; Thu, 28 Mar 2019 14:03:46 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 79FA78B90A; Thu, 28 Mar 2019 14:03:46 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id DF2A06FC7A; Thu, 28 Mar 2019 13:03:45 +0000 (UTC) Message-Id: <92e8f0bcec682e878796758e1efb88c172c7ffe4.1553778054.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH] powerpc/book3e: drop BUG_ON() in map_kernel_page() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 28 Mar 2019 13:03:45 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org early_alloc_pgtable() never returns NULL as it panics on failure. This patch drops the three BUG_ON() which check the non nullity of early_alloc_pgtable() returned value. Signed-off-by: Christophe Leroy --- arch/powerpc/mm/pgtable-book3e.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/powerpc/mm/pgtable-book3e.c b/arch/powerpc/mm/pgtable-book3e.c index 1032ef7aaf62..390a6d0b216d 100644 --- a/arch/powerpc/mm/pgtable-book3e.c +++ b/arch/powerpc/mm/pgtable-book3e.c @@ -98,20 +98,17 @@ int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot) #ifndef __PAGETABLE_PUD_FOLDED if (pgd_none(*pgdp)) { pudp = early_alloc_pgtable(PUD_TABLE_SIZE); - BUG_ON(pudp == NULL); pgd_populate(&init_mm, pgdp, pudp); } #endif /* !__PAGETABLE_PUD_FOLDED */ pudp = pud_offset(pgdp, ea); if (pud_none(*pudp)) { pmdp = early_alloc_pgtable(PMD_TABLE_SIZE); - BUG_ON(pmdp == NULL); pud_populate(&init_mm, pudp, pmdp); } pmdp = pmd_offset(pudp, ea); if (!pmd_present(*pmdp)) { ptep = early_alloc_pgtable(PAGE_SIZE); - BUG_ON(ptep == NULL); pmd_populate_kernel(&init_mm, pmdp, ptep); } ptep = pte_offset_kernel(pmdp, ea); -- 2.13.3