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 <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Link: https://lore.kernel.org/all/20230519190752.3297140-8-steve.wahl%40hpe.com

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 10d3bdf874a08930db18b71c5ef51430c382e09d..1836330ff7b3d574a7bb525ac162a1da54a36be4 100644 (file)
--- 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();