#endif /* CONFIG_KUNIT */
 
-static DEFINE_SPINLOCK(report_lock);
+static DEFINE_RAW_SPINLOCK(report_lock);
 
 static void start_report(unsigned long *flags, bool sync)
 {
        lockdep_off();
        /* Make sure we don't end up in loop. */
        report_suppress_start();
-       spin_lock_irqsave(&report_lock, *flags);
+       raw_spin_lock_irqsave(&report_lock, *flags);
        pr_err("==================================================================\n");
 }
 
                trace_error_report_end(ERROR_DETECTOR_KASAN,
                                       (unsigned long)addr);
        pr_err("==================================================================\n");
-       spin_unlock_irqrestore(&report_lock, *flags);
+       raw_spin_unlock_irqrestore(&report_lock, *flags);
        if (!test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags))
                check_panic_on_warn("KASAN");
        switch (kasan_arg_fault) {