From: zhouchuangao <zhouchuangao@vivo.com>
Date: Tue, 30 Mar 2021 13:56:26 +0000 (-0700)
Subject: riscv/mm: Use BUG_ON instead of if condition followed by BUG.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e75e6bf47a4723ce16f65c7387c20a8c18a1c13b;p=uclinux-h8%2Flinux.git

riscv/mm: Use BUG_ON instead of if condition followed by BUG.

BUG_ON() uses unlikely in if(), which can be optimized at compile time.

Signed-off-by: zhouchuangao <zhouchuangao@vivo.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---

diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 9914ca0d789b..a2f4c148f02e 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -232,8 +232,8 @@ static phys_addr_t alloc_pte_late(uintptr_t va)
 	unsigned long vaddr;
 
 	vaddr = __get_free_page(GFP_KERNEL);
-	if (!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr)))
-		BUG();
+	BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr)));
+
 	return __pa(vaddr);
 }