Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5f7eac4 authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

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: default avatarPetr Tesarik <ptesarik@suse.cz>
Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: <linux-arch@vger.kernel.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e8c158bb

arch/alpha/include/asm/spinlock.h

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ static inline void __raw_write_unlock(raw_rwlock_t * lock) 
	lock->lock = 0;

}



#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)

#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)



#define _raw_spin_relax(lock)	cpu_relax()

#define _raw_read_relax(lock)	cpu_relax()

#define _raw_write_relax(lock)	cpu_relax()

arch/arm/include/asm/spinlock.h

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw) 
/* read_can_lock - would read_trylock() succeed? */

#define __raw_read_can_lock(x)		((x)->lock < 0x80000000)



#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)

#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)



#define _raw_spin_relax(lock)	cpu_relax()

#define _raw_read_relax(lock)	cpu_relax()

#define _raw_write_relax(lock)	cpu_relax()

arch/cris/include/arch-v32/arch/spinlock.h

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw) 
	return 1;

}



#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)

#define _raw_write_lock_flags(lock, flags) _raw_write_lock(lock)



#define _raw_spin_relax(lock)	cpu_relax()

#define _raw_read_relax(lock)	cpu_relax()

arch/ia64/include/asm/spinlock.h

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ static inline int __raw_read_trylock(raw_rwlock_t *x) 
	return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word;

}



#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)

#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)



#define _raw_spin_relax(lock)	cpu_relax()

#define _raw_read_relax(lock)	cpu_relax()

#define _raw_write_relax(lock)	cpu_relax()

arch/mips/include/asm/spinlock.h

+2 −0
Original line number Diff line number Diff line
@@ -480,6 +480,8 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw) 
	return ret;

}



#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)

#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)



#define _raw_spin_relax(lock)	cpu_relax()

#define _raw_read_relax(lock)	cpu_relax()