Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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>
  • Loading branch information...
commit f242836504c346c9d706999cda9ca0ff59b30862 1 parent 3a485d2
Lars-Peter Clausen authored October 20, 2012
2  fs/buffer.c
@@ -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
 
3  kernel/softirq.c
@@ -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

0 notes on commit f242836

Please sign in to comment.
Something went wrong with that request. Please try again.