The patch titled
lock validator: __local_bh_enable -> _local_bh_enable
has been removed from the -mm tree. Its filename is
lock-validator-__local_bh_enable-_local_bh_enable.patch
This patch was dropped because lockdep is being redone
------------------------------------------------------
Subject: lock validator: __local_bh_enable -> _local_bh_enable
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Add EXPORT_SYMBOL for _local_bh_enable and convert s390 usages of
__local_bh_enable() to _local_bh_enable().
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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 -puN arch/s390/kernel/irq.c~lock-validator-__local_bh_enable-_local_bh_enable arch/s390/kernel/irq.c
--- 25/arch/s390/kernel/irq.c~lock-validator-__local_bh_enable-_local_bh_enable Mon Jun 19 15:06:13 2006
+++ 25-akpm/arch/s390/kernel/irq.c Mon Jun 19 15:06:13 2006
@@ -97,7 +97,7 @@ asmlinkage void do_softirq(void)
account_system_vtime(current);
- __local_bh_enable();
+ _local_bh_enable();
local_irq_restore(flags);
}
diff -puN drivers/s390/char/sclp.c~lock-validator-__local_bh_enable-_local_bh_enable drivers/s390/char/sclp.c
--- 25/drivers/s390/char/sclp.c~lock-validator-__local_bh_enable-_local_bh_enable Mon Jun 19 15:06:13 2006
+++ 25-akpm/drivers/s390/char/sclp.c Mon Jun 19 15:06:13 2006
@@ -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 -puN drivers/s390/cio/cio.c~lock-validator-__local_bh_enable-_local_bh_enable drivers/s390/cio/cio.c
--- 25/drivers/s390/cio/cio.c~lock-validator-__local_bh_enable-_local_bh_enable Mon Jun 19 15:06:13 2006
+++ 25-akpm/drivers/s390/cio/cio.c Mon Jun 19 15:06:13 2006
@@ -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 -puN kernel/softirq.c~lock-validator-__local_bh_enable-_local_bh_enable kernel/softirq.c
--- 25/kernel/softirq.c~lock-validator-__local_bh_enable-_local_bh_enable Mon Jun 19 15:06:13 2006
+++ 25-akpm/kernel/softirq.c Mon Jun 19 15:06:13 2006
@@ -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;
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
origin.patch
git-klibc.patch
git-s390.patch
zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-s390-fix.patch
s390-move-var-declarations-behind-ifdef.patch
fix-oddball-boolean-logic-in-s390-netiucv.patch
s390-broken-null-test-in-claw-driver.patch
cpu-hotplug-fix-cpu_up_cancel-handling.patch
s390-setupc-cleanup-build-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
