diff options
| author | Liming Wang <liming.wang@windriver.com> | 2008-11-28 09:52:40 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-28 12:38:38 +0100 |
| commit | 8b752e3ef6e3f5cde87afc649dd51d92b1e549c1 (patch) | |
| tree | 352c2790e31c595cb4c15e4fe751251c4596299f | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
| download | lwn-8b752e3ef6e3f5cde87afc649dd51d92b1e549c1.tar.gz lwn-8b752e3ef6e3f5cde87afc649dd51d92b1e549c1.zip | |
softirq: remove useless function __local_bh_enable
Impact: remove unused code
__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.
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/linux/bottom_half.h | 1 | ||||
| -rw-r--r-- | kernel/softirq.c | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h index 777dbf695d44..27b1bcffe408 100644 --- a/include/linux/bottom_half.h +++ b/include/linux/bottom_half.h @@ -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); diff --git a/kernel/softirq.c b/kernel/softirq.c index e7c69a720d69..8d9934b4162a 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -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(), |