Restore some commented out BUG_ON/WARN_ON irqs_disabled

These do not trigger anymore, so get the code back in sync with mainline. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
m-labs · Oct 20, 2012 · f242836 · f242836
1 parent 3a485d2
commit f242836
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/fs/buffer.c b/fs/buffer.c
@@ -1215,7 +1215,7 @@ static DEFINE_PER_CPU(struct bh_lru, bh_lrus) = {{ NULL }};
 static inline void check_irqs_on(void)
 {
 #ifdef irqs_disabled
-//	BUG_ON(irqs_disabled());
+	BUG_ON(irqs_disabled());
 #endif
 }
 

diff --git a/kernel/softirq.c b/kernel/softirq.c
@@ -156,8 +156,7 @@ EXPORT_SYMBOL(_local_bh_enable);
 
 static inline void _local_bh_enable_ip(unsigned long ip)
 {
-//	WARN_ON_ONCE(in_irq() || irqs_disabled());
-	WARN_ON_ONCE(in_irq());
+	WARN_ON_ONCE(in_irq() || irqs_disabled());
 #ifdef CONFIG_TRACE_IRQFLAGS
 	local_irq_disable();
 #endif