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

Commit 9c1721aa authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

locking: Cleanup the name space completely 



Make the name space hierarchy of locking functions consistent:
     raw_spin* -> _raw_spin* -> __raw_spin*

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9828ea9d

include/linux/rwlock.h

+25 −25
Original line number Diff line number Diff line
@@ -58,23 +58,23 @@ do { \ 
 * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various

 * methods are defined as nops in the case they are not required.

 */

#define read_trylock(lock)		__cond_lock(lock, _read_trylock(lock))

#define write_trylock(lock)		__cond_lock(lock, _write_trylock(lock))

#define read_trylock(lock)	__cond_lock(lock, _raw_read_trylock(lock))

#define write_trylock(lock)	__cond_lock(lock, _raw_write_trylock(lock))



#define write_lock(lock)		_write_lock(lock)

#define read_lock(lock)			_read_lock(lock)

#define write_lock(lock)	_raw_write_lock(lock)

#define read_lock(lock)		_raw_read_lock(lock)



#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)



#define read_lock_irqsave(lock, flags)			\

	do {						\

		typecheck(unsigned long, flags);	\

		flags = _read_lock_irqsave(lock);	\

		flags = _raw_read_lock_irqsave(lock);	\

	} while (0)

#define write_lock_irqsave(lock, flags)			\

	do {						\

		typecheck(unsigned long, flags);	\

		flags = _write_lock_irqsave(lock);	\

		flags = _raw_write_lock_irqsave(lock);	\

	} while (0)



#else
@@ -82,38 +82,38 @@ do { \ 
#define read_lock_irqsave(lock, flags)			\

	do {						\

		typecheck(unsigned long, flags);	\

		_read_lock_irqsave(lock, flags);	\

		_raw_read_lock_irqsave(lock, flags);	\

	} while (0)

#define write_lock_irqsave(lock, flags)			\

	do {						\

		typecheck(unsigned long, flags);	\

		_write_lock_irqsave(lock, flags);	\

		_raw_write_lock_irqsave(lock, flags);	\

	} while (0)



#endif



#define read_lock_irq(lock)		_read_lock_irq(lock)

#define read_lock_bh(lock)		_read_lock_bh(lock)

#define write_lock_irq(lock)		_write_lock_irq(lock)

#define write_lock_bh(lock)		_write_lock_bh(lock)

#define read_unlock(lock)		_read_unlock(lock)

#define write_unlock(lock)		_write_unlock(lock)

#define read_unlock_irq(lock)		_read_unlock_irq(lock)

#define write_unlock_irq(lock)		_write_unlock_irq(lock)

#define read_lock_irq(lock)		_raw_read_lock_irq(lock)

#define read_lock_bh(lock)		_raw_read_lock_bh(lock)

#define write_lock_irq(lock)		_raw_write_lock_irq(lock)

#define write_lock_bh(lock)		_raw_write_lock_bh(lock)

#define read_unlock(lock)		_raw_read_unlock(lock)

#define write_unlock(lock)		_raw_write_unlock(lock)

#define read_unlock_irq(lock)		_raw_read_unlock_irq(lock)

#define write_unlock_irq(lock)		_raw_write_unlock_irq(lock)



#define read_unlock_irqrestore(lock, flags)			\

	do {							\

		typecheck(unsigned long, flags);		\

		_read_unlock_irqrestore(lock, flags);	\

		_raw_read_unlock_irqrestore(lock, flags);	\

	} while (0)

#define read_unlock_bh(lock)		_read_unlock_bh(lock)

#define read_unlock_bh(lock)		_raw_read_unlock_bh(lock)



#define write_unlock_irqrestore(lock, flags)		\

	do {						\

		typecheck(unsigned long, flags);	\

		_write_unlock_irqrestore(lock, flags);	\

		_raw_write_unlock_irqrestore(lock, flags);	\

	} while (0)

#define write_unlock_bh(lock)		_write_unlock_bh(lock)

#define write_unlock_bh(lock)		_raw_write_unlock_bh(lock)



#define write_trylock_irqsave(lock, flags) \

({ \

include/linux/rwlock_api_smp.h

+59 −54
Original line number Diff line number Diff line
@@ -15,102 +15,106 @@ 
 * Released under the General Public License (GPL).

 */



void __lockfunc _read_lock(rwlock_t *lock)		__acquires(lock);

void __lockfunc _write_lock(rwlock_t *lock)		__acquires(lock);

void __lockfunc _read_lock_bh(rwlock_t *lock)		__acquires(lock);

void __lockfunc _write_lock_bh(rwlock_t *lock)		__acquires(lock);

void __lockfunc _read_lock_irq(rwlock_t *lock)		__acquires(lock);

void __lockfunc _write_lock_irq(rwlock_t *lock)		__acquires(lock);

unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)

void __lockfunc _raw_read_lock(rwlock_t *lock)		__acquires(lock);

void __lockfunc _raw_write_lock(rwlock_t *lock)		__acquires(lock);

void __lockfunc _raw_read_lock_bh(rwlock_t *lock)	__acquires(lock);

void __lockfunc _raw_write_lock_bh(rwlock_t *lock)	__acquires(lock);

void __lockfunc _raw_read_lock_irq(rwlock_t *lock)	__acquires(lock);

void __lockfunc _raw_write_lock_irq(rwlock_t *lock)	__acquires(lock);

unsigned long __lockfunc _raw_read_lock_irqsave(rwlock_t *lock)

							__acquires(lock);

unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)

unsigned long __lockfunc _raw_write_lock_irqsave(rwlock_t *lock)

							__acquires(lock);

int __lockfunc _read_trylock(rwlock_t *lock);

int __lockfunc _write_trylock(rwlock_t *lock);

void __lockfunc _read_unlock(rwlock_t *lock)		__releases(lock);

void __lockfunc _write_unlock(rwlock_t *lock)		__releases(lock);

void __lockfunc _read_unlock_bh(rwlock_t *lock)		__releases(lock);

void __lockfunc _write_unlock_bh(rwlock_t *lock)	__releases(lock);

void __lockfunc _read_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc _write_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

int __lockfunc _raw_read_trylock(rwlock_t *lock);

int __lockfunc _raw_write_trylock(rwlock_t *lock);

void __lockfunc _raw_read_unlock(rwlock_t *lock)	__releases(lock);

void __lockfunc _raw_write_unlock(rwlock_t *lock)	__releases(lock);

void __lockfunc _raw_read_unlock_bh(rwlock_t *lock)	__releases(lock);

void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)	__releases(lock);

void __lockfunc _raw_read_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc _raw_write_unlock_irq(rwlock_t *lock)	__releases(lock);

void __lockfunc

_raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(lock);

void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

void __lockfunc

_raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(lock);



#ifdef CONFIG_INLINE_READ_LOCK

#define _read_lock(lock) __read_lock(lock)

#define _raw_read_lock(lock) __raw_read_lock(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_LOCK

#define _write_lock(lock) __write_lock(lock)

#define _raw_write_lock(lock) __raw_write_lock(lock)

#endif



#ifdef CONFIG_INLINE_READ_LOCK_BH

#define _read_lock_bh(lock) __read_lock_bh(lock)

#define _raw_read_lock_bh(lock) __raw_read_lock_bh(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_LOCK_BH

#define _write_lock_bh(lock) __write_lock_bh(lock)

#define _raw_write_lock_bh(lock) __raw_write_lock_bh(lock)

#endif



#ifdef CONFIG_INLINE_READ_LOCK_IRQ

#define _read_lock_irq(lock) __read_lock_irq(lock)

#define _raw_read_lock_irq(lock) __raw_read_lock_irq(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_LOCK_IRQ

#define _write_lock_irq(lock) __write_lock_irq(lock)

#define _raw_write_lock_irq(lock) __raw_write_lock_irq(lock)

#endif



#ifdef CONFIG_INLINE_READ_LOCK_IRQSAVE

#define _read_lock_irqsave(lock) __read_lock_irqsave(lock)

#define _raw_read_lock_irqsave(lock) __raw_read_lock_irqsave(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_LOCK_IRQSAVE

#define _write_lock_irqsave(lock) __write_lock_irqsave(lock)

#define _raw_write_lock_irqsave(lock) __raw_write_lock_irqsave(lock)

#endif



#ifdef CONFIG_INLINE_READ_TRYLOCK

#define _read_trylock(lock) __read_trylock(lock)

#define _raw_read_trylock(lock) __raw_read_trylock(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_TRYLOCK

#define _write_trylock(lock) __write_trylock(lock)

#define _raw_write_trylock(lock) __raw_write_trylock(lock)

#endif



#ifdef CONFIG_INLINE_READ_UNLOCK

#define _read_unlock(lock) __read_unlock(lock)

#define _raw_read_unlock(lock) __raw_read_unlock(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_UNLOCK

#define _write_unlock(lock) __write_unlock(lock)

#define _raw_write_unlock(lock) __raw_write_unlock(lock)

#endif



#ifdef CONFIG_INLINE_READ_UNLOCK_BH

#define _read_unlock_bh(lock) __read_unlock_bh(lock)

#define _raw_read_unlock_bh(lock) __raw_read_unlock_bh(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_UNLOCK_BH

#define _write_unlock_bh(lock) __write_unlock_bh(lock)

#define _raw_write_unlock_bh(lock) __raw_write_unlock_bh(lock)

#endif



#ifdef CONFIG_INLINE_READ_UNLOCK_IRQ

#define _read_unlock_irq(lock) __read_unlock_irq(lock)

#define _raw_read_unlock_irq(lock) __raw_read_unlock_irq(lock)

#endif



#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQ

#define _write_unlock_irq(lock) __write_unlock_irq(lock)

#define _raw_write_unlock_irq(lock) __raw_write_unlock_irq(lock)

#endif



#ifdef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE

#define _read_unlock_irqrestore(lock, flags) __read_unlock_irqrestore(lock, flags)

#define _raw_read_unlock_irqrestore(lock, flags) \

	__raw_read_unlock_irqrestore(lock, flags)

#endif



#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE

#define _write_unlock_irqrestore(lock, flags) __write_unlock_irqrestore(lock, flags)

#define _raw_write_unlock_irqrestore(lock, flags) \

	__raw_write_unlock_irqrestore(lock, flags)

#endif



static inline int __read_trylock(rwlock_t *lock)

static inline int __raw_read_trylock(rwlock_t *lock)

{

	preempt_disable();

	if (do_raw_read_trylock(lock)) {
@@ -121,7 +125,7 @@ static inline int __read_trylock(rwlock_t *lock) 
	return 0;

}



static inline int __write_trylock(rwlock_t *lock)

static inline int __raw_write_trylock(rwlock_t *lock)

{

	preempt_disable();

	if (do_raw_write_trylock(lock)) {
@@ -139,14 +143,14 @@ static inline int __write_trylock(rwlock_t *lock) 
 */

#if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC)



static inline void __read_lock(rwlock_t *lock)

static inline void __raw_read_lock(rwlock_t *lock)

{

	preempt_disable();

	rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);

	LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);

}



static inline unsigned long __read_lock_irqsave(rwlock_t *lock)

static inline unsigned long __raw_read_lock_irqsave(rwlock_t *lock)

{

	unsigned long flags;
@@ -158,7 +162,7 @@ static inline unsigned long __read_lock_irqsave(rwlock_t *lock) 
	return flags;

}



static inline void __read_lock_irq(rwlock_t *lock)

static inline void __raw_read_lock_irq(rwlock_t *lock)

{

	local_irq_disable();

	preempt_disable();
@@ -166,7 +170,7 @@ static inline void __read_lock_irq(rwlock_t *lock) 
	LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);

}



static inline void __read_lock_bh(rwlock_t *lock)

static inline void __raw_read_lock_bh(rwlock_t *lock)

{

	local_bh_disable();

	preempt_disable();
@@ -174,7 +178,7 @@ static inline void __read_lock_bh(rwlock_t *lock) 
	LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);

}



static inline unsigned long __write_lock_irqsave(rwlock_t *lock)

static inline unsigned long __raw_write_lock_irqsave(rwlock_t *lock)

{

	unsigned long flags;
@@ -186,7 +190,7 @@ static inline unsigned long __write_lock_irqsave(rwlock_t *lock) 
	return flags;

}



static inline void __write_lock_irq(rwlock_t *lock)

static inline void __raw_write_lock_irq(rwlock_t *lock)

{

	local_irq_disable();

	preempt_disable();
@@ -194,7 +198,7 @@ static inline void __write_lock_irq(rwlock_t *lock) 
	LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);

}



static inline void __write_lock_bh(rwlock_t *lock)

static inline void __raw_write_lock_bh(rwlock_t *lock)

{

	local_bh_disable();

	preempt_disable();
@@ -202,7 +206,7 @@ static inline void __write_lock_bh(rwlock_t *lock) 
	LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);

}



static inline void __write_lock(rwlock_t *lock)

static inline void __raw_write_lock(rwlock_t *lock)

{

	preempt_disable();

	rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
@@ -211,21 +215,22 @@ static inline void __write_lock(rwlock_t *lock) 


#endif /* CONFIG_PREEMPT */



static inline void __write_unlock(rwlock_t *lock)

static inline void __raw_write_unlock(rwlock_t *lock)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_write_unlock(lock);

	preempt_enable();

}



static inline void __read_unlock(rwlock_t *lock)

static inline void __raw_read_unlock(rwlock_t *lock)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_read_unlock(lock);

	preempt_enable();

}



static inline void __read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

static inline void

__raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_read_unlock(lock);
@@ -233,7 +238,7 @@ static inline void __read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 
	preempt_enable();

}



static inline void __read_unlock_irq(rwlock_t *lock)

static inline void __raw_read_unlock_irq(rwlock_t *lock)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_read_unlock(lock);
@@ -241,7 +246,7 @@ static inline void __read_unlock_irq(rwlock_t *lock) 
	preempt_enable();

}



static inline void __read_unlock_bh(rwlock_t *lock)

static inline void __raw_read_unlock_bh(rwlock_t *lock)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_read_unlock(lock);
@@ -249,7 +254,7 @@ static inline void __read_unlock_bh(rwlock_t *lock) 
	local_bh_enable_ip((unsigned long)__builtin_return_address(0));

}



static inline void __write_unlock_irqrestore(rwlock_t *lock,

static inline void __raw_write_unlock_irqrestore(rwlock_t *lock,

					     unsigned long flags)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);
@@ -258,7 +263,7 @@ static inline void __write_unlock_irqrestore(rwlock_t *lock, 
	preempt_enable();

}



static inline void __write_unlock_irq(rwlock_t *lock)

static inline void __raw_write_unlock_irq(rwlock_t *lock)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_write_unlock(lock);
@@ -266,7 +271,7 @@ static inline void __write_unlock_irq(rwlock_t *lock) 
	preempt_enable();

}



static inline void __write_unlock_bh(rwlock_t *lock)

static inline void __raw_write_unlock_bh(rwlock_t *lock)

{

	rwlock_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_write_unlock(lock);

include/linux/spinlock.h

+20 −17
Original line number Diff line number Diff line
@@ -161,20 +161,22 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) 
 * various methods are defined as nops in the case they are not

 * required.

 */

#define raw_spin_trylock(lock)		__cond_lock(lock, _spin_trylock(lock))

#define raw_spin_trylock(lock)	__cond_lock(lock, _raw_spin_trylock(lock))



#define raw_spin_lock(lock)		_spin_lock(lock)

#define raw_spin_lock(lock)	_raw_spin_lock(lock)



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define raw_spin_lock_nested(lock, subclass) _spin_lock_nested(lock, subclass)

# define raw_spin_lock_nested(lock, subclass) \

	_raw_spin_lock_nested(lock, subclass)



# define raw_spin_lock_nest_lock(lock, nest_lock)			\

	 do {								\

		 typecheck(struct lockdep_map *, &(nest_lock)->dep_map);\

		 _spin_lock_nest_lock(lock, &(nest_lock)->dep_map);	\

		 _raw_spin_lock_nest_lock(lock, &(nest_lock)->dep_map);	\

	 } while (0)

#else

# define raw_spin_lock_nested(lock, subclass)		_spin_lock(lock)

# define raw_spin_lock_nest_lock(lock, nest_lock)	_spin_lock(lock)

# define raw_spin_lock_nested(lock, subclass)		_raw_spin_lock(lock)

# define raw_spin_lock_nest_lock(lock, nest_lock)	_raw_spin_lock(lock)

#endif



#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
@@ -182,20 +184,20 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) 
#define raw_spin_lock_irqsave(lock, flags)			\

	do {						\

		typecheck(unsigned long, flags);	\

		flags = _spin_lock_irqsave(lock);	\

		flags = _raw_spin_lock_irqsave(lock);	\

	} while (0)



#ifdef CONFIG_DEBUG_LOCK_ALLOC

#define raw_spin_lock_irqsave_nested(lock, flags, subclass)		\

	do {								\

		typecheck(unsigned long, flags);			\

		flags = _spin_lock_irqsave_nested(lock, subclass);	\

		flags = _raw_spin_lock_irqsave_nested(lock, subclass);	\

	} while (0)

#else

#define raw_spin_lock_irqsave_nested(lock, flags, subclass)		\

	do {								\

		typecheck(unsigned long, flags);			\

		flags = _spin_lock_irqsave(lock);			\

		flags = _raw_spin_lock_irqsave(lock);			\

	} while (0)

#endif
@@ -204,7 +206,7 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) 
#define raw_spin_lock_irqsave(lock, flags)		\

	do {						\

		typecheck(unsigned long, flags);	\

		_spin_lock_irqsave(lock, flags);	\

		_raw_spin_lock_irqsave(lock, flags);	\

	} while (0)



#define raw_spin_lock_irqsave_nested(lock, flags, subclass)	\
@@ -212,19 +214,20 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) 


#endif



#define raw_spin_lock_irq(lock)	_spin_lock_irq(lock)

#define raw_spin_lock_bh(lock)		_spin_lock_bh(lock)

#define raw_spin_unlock(lock)		_spin_unlock(lock)

#define raw_spin_unlock_irq(lock)	_spin_unlock_irq(lock)

#define raw_spin_lock_irq(lock)		_raw_spin_lock_irq(lock)

#define raw_spin_lock_bh(lock)		_raw_spin_lock_bh(lock)

#define raw_spin_unlock(lock)		_raw_spin_unlock(lock)

#define raw_spin_unlock_irq(lock)	_raw_spin_unlock_irq(lock)



#define raw_spin_unlock_irqrestore(lock, flags)		\

	do {							\

		typecheck(unsigned long, flags);		\

		_spin_unlock_irqrestore(lock, flags);	\

		_raw_spin_unlock_irqrestore(lock, flags);	\

	} while (0)

#define raw_spin_unlock_bh(lock)	_spin_unlock_bh(lock)

#define raw_spin_unlock_bh(lock)	_raw_spin_unlock_bh(lock)



#define raw_spin_trylock_bh(lock)	__cond_lock(lock, _spin_trylock_bh(lock))

#define raw_spin_trylock_bh(lock) \

	__cond_lock(lock, _raw_spin_trylock_bh(lock))



#define raw_spin_trylock_irq(lock) \

({ \

include/linux/spinlock_api_smp.h

+40 −39
Original line number Diff line number Diff line
@@ -19,70 +19,71 @@ int in_lock_functions(unsigned long addr); 


#define assert_raw_spin_locked(x)	BUG_ON(!raw_spin_is_locked(x))



void __lockfunc _spin_lock(raw_spinlock_t *lock)	__acquires(lock);

void __lockfunc _spin_lock_nested(raw_spinlock_t *lock, int subclass)

void __lockfunc _raw_spin_lock(raw_spinlock_t *lock)		__acquires(lock);

void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)

								__acquires(lock);

void __lockfunc

_spin_lock_nest_lock(raw_spinlock_t *lock, struct lockdep_map *map)

_raw_spin_lock_nest_lock(raw_spinlock_t *lock, struct lockdep_map *map)

								__acquires(lock);

void __lockfunc _raw_spin_lock_bh(raw_spinlock_t *lock)		__acquires(lock);

void __lockfunc _raw_spin_lock_irq(raw_spinlock_t *lock)

								__acquires(lock);

void __lockfunc _spin_lock_bh(raw_spinlock_t *lock)	__acquires(lock);

void __lockfunc _spin_lock_irq(raw_spinlock_t *lock)	__acquires(lock);



unsigned long __lockfunc _spin_lock_irqsave(raw_spinlock_t *lock)

unsigned long __lockfunc _raw_spin_lock_irqsave(raw_spinlock_t *lock)

								__acquires(lock);

unsigned long __lockfunc

_spin_lock_irqsave_nested(raw_spinlock_t *lock, int subclass)

_raw_spin_lock_irqsave_nested(raw_spinlock_t *lock, int subclass)

								__acquires(lock);

int __lockfunc _spin_trylock(raw_spinlock_t *lock);

int __lockfunc _spin_trylock_bh(raw_spinlock_t *lock);

void __lockfunc _spin_unlock(raw_spinlock_t *lock)	__releases(lock);

void __lockfunc _spin_unlock_bh(raw_spinlock_t *lock)	__releases(lock);

void __lockfunc _spin_unlock_irq(raw_spinlock_t *lock)	__releases(lock);

int __lockfunc _raw_spin_trylock(raw_spinlock_t *lock);

int __lockfunc _raw_spin_trylock_bh(raw_spinlock_t *lock);

void __lockfunc _raw_spin_unlock(raw_spinlock_t *lock)		__releases(lock);

void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)	__releases(lock);

void __lockfunc _raw_spin_unlock_irq(raw_spinlock_t *lock)	__releases(lock);

void __lockfunc

_spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)

_raw_spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)

								__releases(lock);



#ifdef CONFIG_INLINE_SPIN_LOCK

#define _spin_lock(lock) __spin_lock(lock)

#define _raw_spin_lock(lock) __raw_spin_lock(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_LOCK_BH

#define _spin_lock_bh(lock) __spin_lock_bh(lock)

#define _raw_spin_lock_bh(lock) __raw_spin_lock_bh(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_LOCK_IRQ

#define _spin_lock_irq(lock) __spin_lock_irq(lock)

#define _raw_spin_lock_irq(lock) __raw_spin_lock_irq(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_LOCK_IRQSAVE

#define _spin_lock_irqsave(lock) __spin_lock_irqsave(lock)

#define _raw_spin_lock_irqsave(lock) __raw_spin_lock_irqsave(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_TRYLOCK

#define _spin_trylock(lock) __spin_trylock(lock)

#define _raw_spin_trylock(lock) __raw_spin_trylock(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_TRYLOCK_BH

#define _spin_trylock_bh(lock) __spin_trylock_bh(lock)

#define _raw_spin_trylock_bh(lock) __raw_spin_trylock_bh(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_UNLOCK

#define _spin_unlock(lock) __spin_unlock(lock)

#define _raw_spin_unlock(lock) __raw_spin_unlock(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_UNLOCK_BH

#define _spin_unlock_bh(lock) __spin_unlock_bh(lock)

#define _raw_spin_unlock_bh(lock) __raw_spin_unlock_bh(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQ

#define _spin_unlock_irq(lock) __spin_unlock_irq(lock)

#define _raw_spin_unlock_irq(lock) __raw_spin_unlock_irq(lock)

#endif



#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE

#define _spin_unlock_irqrestore(lock, flags) __spin_unlock_irqrestore(lock, flags)

#define _raw_spin_unlock_irqrestore(lock, flags) __raw_spin_unlock_irqrestore(lock, flags)

#endif



static inline int __spin_trylock(raw_spinlock_t *lock)

static inline int __raw_spin_trylock(raw_spinlock_t *lock)

{

	preempt_disable();

	if (do_raw_spin_trylock(lock)) {
@@ -100,7 +101,7 @@ static inline int __spin_trylock(raw_spinlock_t *lock) 
 */

#if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC)



static inline unsigned long __spin_lock_irqsave(raw_spinlock_t *lock)

static inline unsigned long __raw_spin_lock_irqsave(raw_spinlock_t *lock)

{

	unsigned long flags;
@@ -120,7 +121,7 @@ static inline unsigned long __spin_lock_irqsave(raw_spinlock_t *lock) 
	return flags;

}



static inline void __spin_lock_irq(raw_spinlock_t *lock)

static inline void __raw_spin_lock_irq(raw_spinlock_t *lock)

{

	local_irq_disable();

	preempt_disable();
@@ -128,7 +129,7 @@ static inline void __spin_lock_irq(raw_spinlock_t *lock) 
	LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);

}



static inline void __spin_lock_bh(raw_spinlock_t *lock)

static inline void __raw_spin_lock_bh(raw_spinlock_t *lock)

{

	local_bh_disable();

	preempt_disable();
@@ -136,7 +137,7 @@ static inline void __spin_lock_bh(raw_spinlock_t *lock) 
	LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);

}



static inline void __spin_lock(raw_spinlock_t *lock)

static inline void __raw_spin_lock(raw_spinlock_t *lock)

{

	preempt_disable();

	spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
@@ -145,14 +146,14 @@ static inline void __spin_lock(raw_spinlock_t *lock) 


#endif /* CONFIG_PREEMPT */



static inline void __spin_unlock(raw_spinlock_t *lock)

static inline void __raw_spin_unlock(raw_spinlock_t *lock)

{

	spin_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_spin_unlock(lock);

	preempt_enable();

}



static inline void __spin_unlock_irqrestore(raw_spinlock_t *lock,

static inline void __raw_spin_unlock_irqrestore(raw_spinlock_t *lock,

					    unsigned long flags)

{

	spin_release(&lock->dep_map, 1, _RET_IP_);
@@ -161,7 +162,7 @@ static inline void __spin_unlock_irqrestore(raw_spinlock_t *lock, 
	preempt_enable();

}



static inline void __spin_unlock_irq(raw_spinlock_t *lock)

static inline void __raw_spin_unlock_irq(raw_spinlock_t *lock)

{

	spin_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_spin_unlock(lock);
@@ -169,7 +170,7 @@ static inline void __spin_unlock_irq(raw_spinlock_t *lock) 
	preempt_enable();

}



static inline void __spin_unlock_bh(raw_spinlock_t *lock)

static inline void __raw_spin_unlock_bh(raw_spinlock_t *lock)

{

	spin_release(&lock->dep_map, 1, _RET_IP_);

	do_raw_spin_unlock(lock);
@@ -177,7 +178,7 @@ static inline void __spin_unlock_bh(raw_spinlock_t *lock) 
	local_bh_enable_ip((unsigned long)__builtin_return_address(0));

}



static inline int __spin_trylock_bh(raw_spinlock_t *lock)

static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock)

{

	local_bh_disable();

	preempt_disable();

include/linux/spinlock_api_up.h

+34 −30
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ 
  do { preempt_enable(); __release(lock); (void)(lock); } while (0)



#define __UNLOCK_BH(lock) \

  do { preempt_enable_no_resched(); local_bh_enable(); __release(lock); (void)(lock); } while (0)

  do { preempt_enable_no_resched(); local_bh_enable(); \

	  __release(lock); (void)(lock); } while (0)



#define __UNLOCK_IRQ(lock) \

  do { local_irq_enable(); __UNLOCK(lock); } while (0)
@@ -48,34 +49,37 @@ 
#define __UNLOCK_IRQRESTORE(lock, flags) \

  do { local_irq_restore(flags); __UNLOCK(lock); } while (0)



#define _spin_lock(lock)			__LOCK(lock)

#define _spin_lock_nested(lock, subclass)	__LOCK(lock)

#define _read_lock(lock)			__LOCK(lock)

#define _write_lock(lock)			__LOCK(lock)

#define _spin_lock_bh(lock)			__LOCK_BH(lock)

#define _read_lock_bh(lock)			__LOCK_BH(lock)

#define _write_lock_bh(lock)			__LOCK_BH(lock)

#define _spin_lock_irq(lock)			__LOCK_IRQ(lock)

#define _read_lock_irq(lock)			__LOCK_IRQ(lock)

#define _write_lock_irq(lock)			__LOCK_IRQ(lock)

#define _spin_lock_irqsave(lock, flags)		__LOCK_IRQSAVE(lock, flags)

#define _read_lock_irqsave(lock, flags)		__LOCK_IRQSAVE(lock, flags)

#define _write_lock_irqsave(lock, flags)	__LOCK_IRQSAVE(lock, flags)

#define _spin_trylock(lock)			({ __LOCK(lock); 1; })

#define _read_trylock(lock)			({ __LOCK(lock); 1; })

#define _write_trylock(lock)			({ __LOCK(lock); 1; })

#define _spin_trylock_bh(lock)			({ __LOCK_BH(lock); 1; })

#define _spin_unlock(lock)			__UNLOCK(lock)

#define _read_unlock(lock)			__UNLOCK(lock)

#define _write_unlock(lock)			__UNLOCK(lock)

#define _spin_unlock_bh(lock)			__UNLOCK_BH(lock)

#define _write_unlock_bh(lock)			__UNLOCK_BH(lock)

#define _read_unlock_bh(lock)			__UNLOCK_BH(lock)

#define _spin_unlock_irq(lock)			__UNLOCK_IRQ(lock)

#define _read_unlock_irq(lock)			__UNLOCK_IRQ(lock)

#define _write_unlock_irq(lock)			__UNLOCK_IRQ(lock)

#define _spin_unlock_irqrestore(lock, flags)	__UNLOCK_IRQRESTORE(lock, flags)

#define _read_unlock_irqrestore(lock, flags)	__UNLOCK_IRQRESTORE(lock, flags)

#define _write_unlock_irqrestore(lock, flags)	__UNLOCK_IRQRESTORE(lock, flags)

#define _raw_spin_lock(lock)			__LOCK(lock)

#define _raw_spin_lock_nested(lock, subclass)	__LOCK(lock)

#define _raw_read_lock(lock)			__LOCK(lock)

#define _raw_write_lock(lock)			__LOCK(lock)

#define _raw_spin_lock_bh(lock)			__LOCK_BH(lock)

#define _raw_read_lock_bh(lock)			__LOCK_BH(lock)

#define _raw_write_lock_bh(lock)		__LOCK_BH(lock)

#define _raw_spin_lock_irq(lock)		__LOCK_IRQ(lock)

#define _raw_read_lock_irq(lock)		__LOCK_IRQ(lock)

#define _raw_write_lock_irq(lock)		__LOCK_IRQ(lock)

#define _raw_spin_lock_irqsave(lock, flags)	__LOCK_IRQSAVE(lock, flags)

#define _raw_read_lock_irqsave(lock, flags)	__LOCK_IRQSAVE(lock, flags)

#define _raw_write_lock_irqsave(lock, flags)	__LOCK_IRQSAVE(lock, flags)

#define _raw_spin_trylock(lock)			({ __LOCK(lock); 1; })

#define _raw_read_trylock(lock)			({ __LOCK(lock); 1; })

#define _raw_write_trylock(lock)			({ __LOCK(lock); 1; })

#define _raw_spin_trylock_bh(lock)		({ __LOCK_BH(lock); 1; })

#define _raw_spin_unlock(lock)			__UNLOCK(lock)

#define _raw_read_unlock(lock)			__UNLOCK(lock)

#define _raw_write_unlock(lock)			__UNLOCK(lock)

#define _raw_spin_unlock_bh(lock)		__UNLOCK_BH(lock)

#define _raw_write_unlock_bh(lock)		__UNLOCK_BH(lock)

#define _raw_read_unlock_bh(lock)		__UNLOCK_BH(lock)

#define _raw_spin_unlock_irq(lock)		__UNLOCK_IRQ(lock)

#define _raw_read_unlock_irq(lock)		__UNLOCK_IRQ(lock)

#define _raw_write_unlock_irq(lock)		__UNLOCK_IRQ(lock)

#define _raw_spin_unlock_irqrestore(lock, flags) \

					__UNLOCK_IRQRESTORE(lock, flags)

#define _raw_read_unlock_irqrestore(lock, flags) \

					__UNLOCK_IRQRESTORE(lock, flags)

#define _raw_write_unlock_irqrestore(lock, flags) \

					__UNLOCK_IRQRESTORE(lock, flags)



#endif /* __LINUX_SPINLOCK_API_UP_H */