diff options
author | Robin Holt <holt@sgi.com> | 2009-04-02 19:59:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-02 22:05:11 -0400 |
commit | f5f7eac41db827a47b2163330eecd7bb55ae9f12 (patch) | |
tree | ae8ab45dba49c1b3d5f2088051389e6fd3e4a24c /arch/ia64 | |
parent | e8c158bb313c1df421eab7dc4299cd39cbbf5895 (diff) |
Allow rwlocks to re-enable interrupts
Pass the original flags to rwlock arch-code, so that it can re-enable
interrupts if implemented for that architecture.
Initially, make __raw_read_lock_flags and __raw_write_lock_flags stubs
which just do the same thing as non-flags variants.
Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
Signed-off-by: Robin Holt <holt@sgi.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: <linux-arch@vger.kernel.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/spinlock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h index 0229fb95fb38..0a619618b2fa 100644 --- a/arch/ia64/include/asm/spinlock.h +++ b/arch/ia64/include/asm/spinlock.h | |||
@@ -213,6 +213,9 @@ static inline int __raw_read_trylock(raw_rwlock_t *x) | |||
213 | return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; | 213 | return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; |
214 | } | 214 | } |
215 | 215 | ||
216 | #define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock) | ||
217 | #define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock) | ||
218 | |||
216 | #define _raw_spin_relax(lock) cpu_relax() | 219 | #define _raw_spin_relax(lock) cpu_relax() |
217 | #define _raw_read_relax(lock) cpu_relax() | 220 | #define _raw_read_relax(lock) cpu_relax() |
218 | #define _raw_write_relax(lock) cpu_relax() | 221 | #define _raw_write_relax(lock) cpu_relax() |