diff mbox series

[tip:,x86/platform] x86/platform/uv: Remove remaining BUG_ON() and BUG() calls

Message ID 168557121537.404.10874117815747545344.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/platform] x86/platform/uv: Remove remaining BUG_ON() and BUG() calls |

Commit Message

tip-bot2 for Thomas Gleixner May 31, 2023, 10:13 p.m. UTC 
  The following commit has been merged into the x86/platform branch of tip:

Commit-ID:     89827568a82d5856f3c8d329d3c2bc0f47385eb9
Gitweb:        https://git.kernel.org/tip/89827568a82d5856f3c8d329d3c2bc0f47385eb9
Author:        Steve Wahl <steve.wahl@hpe.com>
AuthorDate:    Fri, 19 May 2023 14:07:51 -05:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Wed, 31 May 2023 09:35:00 -07:00

x86/platform/uv: Remove remaining BUG_ON() and BUG() calls

Replace BUG and BUG_ON with WARN_ON_ONCE and carry on as best as we
can.

Signed-off-by: Steve Wahl <steve.wahl@hpe.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20230519190752.3297140-8-steve.wahl%40hpe.com
---
 arch/x86/kernel/apic/x2apic_uv_x.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 10d3bdf..1836330 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -617,7 +617,8 @@  static __init void build_uv_gr_table(void)
 
 	bytes = _gr_table_len * sizeof(struct uv_gam_range_s);
 	grt = kzalloc(bytes, GFP_KERNEL);
-	BUG_ON(!grt);
+	if (WARN_ON_ONCE(!grt))
+		return;
 	_gr_table = grt;
 
 	for (; gre->type != UV_GAM_RANGE_TYPE_UNUSED; gre++) {
@@ -1548,7 +1549,8 @@  static void __init build_socket_tables(void)
 			return;
 		}
 		pr_err("UV: Error: UVsystab address translations not available!\n");
-		BUG();
+		WARN_ON_ONCE(!gre);
+		return;
 	}
 
 	numn = num_possible_nodes();