diff --git a/kernel/smp.c b/kernel/smp.c
index 8a847a34f132..f5a4d63f3231 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -335,6 +335,8 @@ static void __csd_lock_wait(call_single_data_t *csd)
 	int bug_id = 0;
 	u64 ts0, ts1;
 
+	guard(preempt)();
+
 	ts1 = ts0 = ktime_get_mono_fast_ns();
 	for (;;) {
 		if (csd_lock_wait_toolong(csd, ts0, &ts1, &bug_id, &nmessages))