From: Martin Schwidefsky Date: Fri, 16 May 2014 07:35:02 +0000 (+0200) Subject: s390/rwlock: add missing local_irq_restore calls X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=939c5ae4029e1679bb93f7d09afb8c831db985bd;p=linux-beck.git s390/rwlock: add missing local_irq_restore calls The out of line _raw_read_lock_wait_flags/_raw_write_lock_wait_flags functions for the arch_read_lock_flags/arch_write_lock_flags calls fail to re-enable the interrupts after another unsuccessful try to get the lock with compare-and-swap. The following wait would be done with interrupts disabled which is suboptimal. Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c index 284d879a9b8c..1dd282c742b5 100644 --- a/arch/s390/lib/spinlock.c +++ b/arch/s390/lib/spinlock.c @@ -143,6 +143,7 @@ void _raw_read_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags) local_irq_disable(); if (_raw_compare_and_swap(&rw->lock, old, old + 1)) return; + local_irq_restore(flags); } } EXPORT_SYMBOL(_raw_read_lock_wait_flags); @@ -199,6 +200,7 @@ void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags) local_irq_disable(); if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000)) return; + local_irq_restore(flags); } } EXPORT_SYMBOL(_raw_write_lock_wait_flags);