2008-11-28 02:08:22

by tip-bot for Liming Wang

Subject: [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.

Signed-off-by: Liming Wang <[email protected]>
---
include/linux/bottom_half.h | 1 -
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 777dbf6..27b1bcf 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 e7c69a7..8d9934b 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(),
--
1.6.0.3

2008-11-28 11:39:18

by Ingo Molnar

Subject: Re: [PATCH 1/1] softirq: remove useless function __local_bh_enable

* Liming Wang <[email protected]> wrote:

> __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 <[email protected]>
> ---
> include/linux/bottom_half.h | 1 -
> kernel/softirq.c | 14 --------------
> 2 files changed, 0 insertions(+), 15 deletions(-)

applied to tip/core/softirq, thanks!

Ingo