From: Heiko Carstens <hca@linux.ibm.com>
Date: Wed, 18 Feb 2026 14:20:11 +0000 (+0100)
Subject: s390/vtime: Use lockdep_assert_irqs_disabled() instead of BUG_ON()
X-Git-Tag: v7.0-rc2~16^2~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f63fd09efe9d9c016fd6378116eb7394edd2f2;p=thirdparty%2Fkernel%2Fstable.git

s390/vtime: Use lockdep_assert_irqs_disabled() instead of BUG_ON()

Use lockdep_assert_irqs_disabled() instead of BUG_ON(). This avoids
crashing the kernel, and generates better code if CONFIG_PROVE_LOCKING
is disabled.

Reviewed-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 4111ff4d727cc..bf48744d09123 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -48,8 +48,7 @@ static inline void set_vtimer(u64 expires)
 
 static inline int virt_timer_forward(u64 elapsed)
 {
-	BUG_ON(!irqs_disabled());
-
+	lockdep_assert_irqs_disabled();
 	if (list_empty(&virt_timer_list))
 		return 0;
 	elapsed = atomic64_add_return(elapsed, &virt_timer_elapsed);