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 4111ff4d727cc43d6352b1f32246f521d0c91b51..bf48744d09123233a38b533c167d4010c73f0b0d 100644 (file)
--- 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);