Merge tag 'for-5.11/drivers-2020-12-14' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / kernel / debug / debug_core.c

diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index 1e75a89..af6e8b4 100644 (file)
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -225,8 +225,6 @@ NOKPROBE_SYMBOL(kgdb_skipexception);
  * Default (weak) implementation for kgdb_roundup_cpus
  */
 
-static DEFINE_PER_CPU(call_single_data_t, kgdb_roundup_csd);
-
 void __weak kgdb_call_nmi_hook(void *ignored)
 {
        /*
@@ -241,6 +239,9 @@ void __weak kgdb_call_nmi_hook(void *ignored)
 }
 NOKPROBE_SYMBOL(kgdb_call_nmi_hook);
 
+static DEFINE_PER_CPU(call_single_data_t, kgdb_roundup_csd) =
+       CSD_INIT(kgdb_call_nmi_hook, NULL);
+
 void __weak kgdb_roundup_cpus(void)
 {
        call_single_data_t *csd;
@@ -267,7 +268,6 @@ void __weak kgdb_roundup_cpus(void)
                        continue;
                kgdb_info[cpu].rounding_up = true;
 
-               csd->func = kgdb_call_nmi_hook;
                ret = smp_call_function_single_async(cpu, csd);
                if (ret)
                        kgdb_info[cpu].rounding_up = false;