Skip to contentSkip to conversation

softirq: remove useless function __local_bh_enable

PATCH Applied Liming Wang 2 participants 2 messages Nov 28, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 softirq: remove useless function __local_bh_enable

__local_bh_enable has been replaced with _local_bh_enable. As comments says "it always nests inside local_bh_enable() sections" has not been valid now. Also there is no reason to use __local_bh_enable anywhere, so we can remove this useless function.

---
 include/linux/bottom_half.h |    1 -
 kernel/softirq.c            |   14 --------------
 2 files changed, 0 insertions(+), 15 deletions(-)
include/linux/bottom_half.h +0 -1
index 777dbf6..27b1bcf 100644
@@ -2,7 +2,6 @@
 #define _LINUX_BH_H
 
 extern void local_bh_disable(void);
-extern void __local_bh_enable(void);
 extern void _local_bh_enable(void);
 extern void local_bh_enable(void);
 extern void local_bh_enable_ip(unsigned long ip);
kernel/softirq.c +0 -14
index e7c69a7..8d9934b 100644
@@ -102,20 +102,6 @@ void local_bh_disable(void)
 
 EXPORT_SYMBOL(local_bh_disable);
 
-void __local_bh_enable(void)
-{
-	WARN_ON_ONCE(in_irq());
-
-	/*
-	 * softirqs should never be enabled by __local_bh_enable(),
-	 * it always nests inside local_bh_enable() sections:
-	 */
-	WARN_ON_ONCE(softirq_count() == SOFTIRQ_OFFSET);
-
-	sub_preempt_count(SOFTIRQ_OFFSET);
-}
-EXPORT_SYMBOL_GPL(__local_bh_enable);
-
 /*
  * Special-case - softirqs can safely be enabled in
  * cond_resched_softirq(), or by __do_softirq(),
Signature · 1 line
1.6.0.3
Applied
#1 lore raw
Quoted 10 lines · Liming Wang

__local_bh_enable has been replaced with _local_bh_enable. As comments says "it always nests inside local_bh_enable() sections" has not been valid now. Also there is no reason to use __local_bh_enable anywhere, so we can remove this useless function.

---
 include/linux/bottom_half.h |    1 -
 kernel/softirq.c            |   14 --------------
 2 files changed, 0 insertions(+), 15 deletions(-)

applied to tip/core/softirq, thanks!

Ingo