Commit 0586bed3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-locking-for-linus' of... 

Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rtmutex: tester: Remove the remaining BKL leftovers
  lockdep/timers: Explain in detail the locking problems del_timer_sync() may cause
  rtmutex: Simplify PI algorithm and make highest prio task get lock
  rwsem: Remove redundant asmregparm annotation
  rwsem: Move duplicate function prototypes to linux/rwsem.h
  rwsem: Unify the duplicate rwsem_is_locked() inlines
  rwsem: Move duplicate init macros and functions to linux/rwsem.h
  rwsem: Move duplicate struct rwsem declaration to linux/rwsem.h
  x86: Cleanup rwsem_count_t typedef
  rwsem: Cleanup includes
  locking: Remove deprecated lock initializers
  cred: Replace deprecated spinlock initialization
  kthread: Replace deprecated spinlock initialization
  xtensa: Replace deprecated spinlock initialization
  um: Replace deprecated spinlock initialization
  sparc: Replace deprecated spinlock initialization
  mips: Replace deprecated spinlock initialization
  cris: Replace deprecated spinlock initialization
  alpha: Replace deprecated spinlock initialization
  rtmutex-tester: Remove BKL tests
parents b80cd62b dbebbfbb

Documentation/spinlocks.txt

+1 −23
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ to change the variables it has to get an exclusive write lock. 


The routines look the same as above:



   rwlock_t xxx_lock = RW_LOCK_UNLOCKED;

   rwlock_t xxx_lock = __RW_LOCK_UNLOCKED(xxx_lock);



	unsigned long flags;
@@ -196,25 +196,3 @@ appropriate: 


For static initialization, use DEFINE_SPINLOCK() / DEFINE_RWLOCK() or

__SPIN_LOCK_UNLOCKED() / __RW_LOCK_UNLOCKED() as appropriate.
 


SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated.  These interfere

with lockdep state tracking.



Most of the time, you can simply turn:

	static spinlock_t xxx_lock = SPIN_LOCK_UNLOCKED;

into:

	static DEFINE_SPINLOCK(xxx_lock);



Static structure member variables go from:



	struct foo bar {

		.lock	=	SPIN_LOCK_UNLOCKED;

	};



to:



	struct foo bar {

		.lock	=	__SPIN_LOCK_UNLOCKED(bar.lock);

	};



Declaration of static rw_locks undergo a similar transformation.

arch/alpha/include/asm/rwsem.h

+0 −36
Original line number Diff line number Diff line
@@ -13,44 +13,13 @@ 
#ifdef __KERNEL__



#include <linux/compiler.h>

#include <linux/list.h>

#include <linux/spinlock.h>



struct rwsem_waiter;



extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *);

extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);



/*

 * the semaphore definition

 */

struct rw_semaphore {

	long			count;

#define RWSEM_UNLOCKED_VALUE		0x0000000000000000L

#define RWSEM_ACTIVE_BIAS		0x0000000000000001L

#define RWSEM_ACTIVE_MASK		0x00000000ffffffffL

#define RWSEM_WAITING_BIAS		(-0x0000000100000000L)

#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)

	spinlock_t		wait_lock;

	struct list_head	wait_list;

};



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \

	LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name) \

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)



static inline void init_rwsem(struct rw_semaphore *sem)

{

	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

}



static inline void __down_read(struct rw_semaphore *sem)

{
@@ -250,10 +219,5 @@ static inline long rwsem_atomic_update(long val, struct rw_semaphore *sem) 
#endif

}



static inline int rwsem_is_locked(struct rw_semaphore *sem)

{

	return (sem->count != 0);

}



#endif /* __KERNEL__ */

#endif /* _ALPHA_RWSEM_H */

arch/cris/arch-v32/kernel/smp.c

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
#define FLUSH_ALL (void*)0xffffffff



/* Vector of locks used for various atomic operations */

spinlock_t cris_atomic_locks[] = { [0 ... LOCK_COUNT - 1] = SPIN_LOCK_UNLOCKED};

spinlock_t cris_atomic_locks[] = {

	[0 ... LOCK_COUNT - 1] = __SPIN_LOCK_UNLOCKED(cris_atomic_locks)

};



/* CPU masks */

cpumask_t phys_cpu_present_map = CPU_MASK_NONE;

arch/ia64/include/asm/rwsem.h

+0 −37
Original line number Diff line number Diff line
@@ -25,20 +25,8 @@ 
#error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead."

#endif



#include <linux/list.h>

#include <linux/spinlock.h>



#include <asm/intrinsics.h>



/*

 * the semaphore definition

 */

struct rw_semaphore {

	signed long		count;

	spinlock_t		wait_lock;

	struct list_head	wait_list;

};



#define RWSEM_UNLOCKED_VALUE		__IA64_UL_CONST(0x0000000000000000)

#define RWSEM_ACTIVE_BIAS		(1L)

#define RWSEM_ACTIVE_MASK		(0xffffffffL)
@@ -46,26 +34,6 @@ struct rw_semaphore { 
#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)



#define __RWSEM_INITIALIZER(name) \

	{ RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \

	  LIST_HEAD_INIT((name).wait_list) }



#define DECLARE_RWSEM(name) \

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)



extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);



static inline void

init_rwsem (struct rw_semaphore *sem)

{

	sem->count = RWSEM_UNLOCKED_VALUE;

	spin_lock_init(&sem->wait_lock);

	INIT_LIST_HEAD(&sem->wait_list);

}



/*

 * lock for reading

 */
@@ -174,9 +142,4 @@ __downgrade_write (struct rw_semaphore *sem) 
#define rwsem_atomic_add(delta, sem)	atomic64_add(delta, (atomic64_t *)(&(sem)->count))

#define rwsem_atomic_update(delta, sem)	atomic64_add_return(delta, (atomic64_t *)(&(sem)->count))



static inline int rwsem_is_locked(struct rw_semaphore *sem)

{

	return (sem->count != 0);

}



#endif /* _ASM_IA64_RWSEM_H */

arch/powerpc/include/asm/rwsem.h

+0 −51
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ 
 * by Paul Mackerras <paulus@samba.org>.

 */



#include <linux/list.h>

#include <linux/spinlock.h>

#include <asm/atomic.h>

#include <asm/system.h>



/*

 * the semaphore definition

 */
@@ -33,47 +28,6 @@ 
#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)



struct rw_semaphore {

	long			count;

	spinlock_t		wait_lock;

	struct list_head	wait_list;

#ifdef CONFIG_DEBUG_LOCK_ALLOC

	struct lockdep_map	dep_map;

#endif

};



#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define __RWSEM_DEP_MAP_INIT(lockname) , .dep_map = { .name = #lockname }

#else

# define __RWSEM_DEP_MAP_INIT(lockname)

#endif



#define __RWSEM_INITIALIZER(name)				\

{								\

	RWSEM_UNLOCKED_VALUE,					\

	__SPIN_LOCK_UNLOCKED((name).wait_lock),			\

	LIST_HEAD_INIT((name).wait_list)			\

	__RWSEM_DEP_MAP_INIT(name)				\

}



#define DECLARE_RWSEM(name)		\

	struct rw_semaphore name = __RWSEM_INITIALIZER(name)



extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);



extern void __init_rwsem(struct rw_semaphore *sem, const char *name,

			 struct lock_class_key *key);



#define init_rwsem(sem)					\

	do {						\

		static struct lock_class_key __key;	\

							\

		__init_rwsem((sem), #sem, &__key);	\

	} while (0)



/*

 * lock for reading

 */
@@ -174,10 +128,5 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem) 
	return atomic_long_add_return(delta, (atomic_long_t *)&sem->count);

}



static inline int rwsem_is_locked(struct rw_semaphore *sem)

{

	return sem->count != 0;

}



#endif	/* __KERNEL__ */

#endif	/* _ASM_POWERPC_RWSEM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE