From: Heiko Carstens <[email protected]>
Add EXPORT_SYMBOL for _local_bh_enable and convert s390 usages of
__local_bh_enable() to _local_bh_enable().
Signed-off-by: Heiko Carstens <[email protected]>
---
arch/s390/kernel/irq.c | 2 +-
drivers/s390/char/sclp.c | 2 +-
drivers/s390/cio/cio.c | 2 +-
kernel/softirq.c | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
diff -purN a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
--- a/arch/s390/kernel/irq.c 2006-06-06 02:57:02.000000000 +0200
+++ b/arch/s390/kernel/irq.c 2006-06-14 13:38:26.000000000 +0200
@@ -97,7 +97,7 @@ asmlinkage void do_softirq(void)
account_system_vtime(current);
- __local_bh_enable();
+ _local_bh_enable();
local_irq_restore(flags);
}
diff -purN a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
--- a/drivers/s390/char/sclp.c 2006-06-14 13:27:15.000000000 +0200
+++ b/drivers/s390/char/sclp.c 2006-06-14 13:38:43.000000000 +0200
@@ -420,7 +420,7 @@ sclp_sync_wait(void)
}
local_irq_disable();
__ctl_load(cr0, 0, 0);
- __local_bh_enable();
+ _local_bh_enable();
local_irq_restore(flags);
}
diff -purN a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
--- a/drivers/s390/cio/cio.c 2006-06-06 02:57:02.000000000 +0200
+++ b/drivers/s390/cio/cio.c 2006-06-14 13:38:26.000000000 +0200
@@ -148,7 +148,7 @@ cio_tpi(void)
sch->driver->irq(&sch->dev);
spin_unlock(&sch->lock);
irq_exit ();
- __local_bh_enable();
+ _local_bh_enable();
return 1;
}
diff -purN a/kernel/softirq.c b/kernel/softirq.c
--- a/kernel/softirq.c 2006-06-14 13:41:30.000000000 +0200
+++ b/kernel/softirq.c 2006-06-14 13:38:26.000000000 +0200
@@ -118,6 +118,8 @@ void _local_bh_enable(void)
sub_preempt_count(SOFTIRQ_OFFSET);
}
+EXPORT_SYMBOL(_local_bh_enable);
+
void local_bh_enable(void)
{
unsigned long flags;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
