Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@larsclausen larsclausen authored
Showing with 2 additions and 3 deletions.
  1. +1 −1  fs/buffer.c
  2. +1 −2  kernel/softirq.c
View
2  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
}
View
3  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
Please sign in to comment.
Something went wrong with that request. Please try again.