Restore some commented out BUG_ON/WARN_ON irqs_disabled

larsclausen · larsclausen · commit f242836504c3 · 2012-10-20T11:06:17.000+02:00
These do not trigger anymore, so get the code back in sync with mainline.

Signed-off-by: Lars-Peter Clausen &lt;lars@metafoo.de&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -1215,7 +1215,7 @@ static DEFINE_PER_CPU(struct bh_lru, bh_lrus) = {{ NULL }};`
`1215`	`1215`	`static inline void check_irqs_on(void)`
`1216`	`1216`	`{`
`1217`	`1217`	`#ifdef irqs_disabled`
`1218`		`-// BUG_ON(irqs_disabled());`
	`1218`	`+ BUG_ON(irqs_disabled());`
`1219`	`1219`	`#endif`
`1220`	`1220`	`}`
`1221`	`1221`
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,7 @@ EXPORT_SYMBOL(_local_bh_enable);`
`156`	`156`
`157`	`157`	`static inline void _local_bh_enable_ip(unsigned long ip)`
`158`	`158`	`{`
`159`		`-// WARN_ON_ONCE(in_irq() \|\| irqs_disabled());`
`160`		`- WARN_ON_ONCE(in_irq());`
	`159`	`+ WARN_ON_ONCE(in_irq() \|\| irqs_disabled());`
`161`	`160`	`#ifdef CONFIG_TRACE_IRQFLAGS`
`162`	`161`	`local_irq_disable();`
`163`	`162`	`#endif`