aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-16 03:35:02 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-05-20 02:58:54 -0400
commit939c5ae4029e1679bb93f7d09afb8c831db985bd (patch)
treeec977875b12965b54a340ac938b07501ec1ed8c4
parentbae8f567344a7cb6a23ca6e13096ba785c69eb42 (diff)
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 <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/lib/spinlock.c2
1 files changed, 2 insertions, 0 deletions
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)
143 local_irq_disable(); 143 local_irq_disable();
144 if (_raw_compare_and_swap(&rw->lock, old, old + 1)) 144 if (_raw_compare_and_swap(&rw->lock, old, old + 1))
145 return; 145 return;
146 local_irq_restore(flags);
146 } 147 }
147} 148}
148EXPORT_SYMBOL(_raw_read_lock_wait_flags); 149EXPORT_SYMBOL(_raw_read_lock_wait_flags);
@@ -199,6 +200,7 @@ void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
199 local_irq_disable(); 200 local_irq_disable();
200 if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000)) 201 if (_raw_compare_and_swap(&rw->lock, 0, 0x80000000))
201 return; 202 return;
203 local_irq_restore(flags);
202 } 204 }
203} 205}
204EXPORT_SYMBOL(_raw_write_lock_wait_flags); 206EXPORT_SYMBOL(_raw_write_lock_wait_flags);