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

hcahca · Vasily Gorbik · commit 80f63fd09efe · 2026-02-25T16:46:07.000+01:00
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 &lt;svens@linux.ibm.com&gt;
Signed-off-by: Heiko Carstens &lt;hca@linux.ibm.com&gt;
Signed-off-by: Vasily Gorbik &lt;gor@linux.ibm.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ static inline void set_vtimer(u64 expires)`
`48`	`48`
`49`	`49`	`static inline int virt_timer_forward(u64 elapsed)`
`50`	`50`	`{`
`51`		`- BUG_ON(!irqs_disabled());`
`52`		`-`
	`51`	`+ lockdep_assert_irqs_disabled();`
`53`	`52`	`if (list_empty(&virt_timer_list))`
`54`	`53`	`return 0;`
`55`	`54`	`elapsed = atomic64_add_return(elapsed, &virt_timer_elapsed);`