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

Commit 6cfd76a2 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

[PATCH] lockdep: name some old style locks 



Name some of the remaning 'old_style_spin_init' locks

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4c410f0

arch/i386/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ void die(const char * str, struct pt_regs * regs, long err) 
		u32 lock_owner;

		int lock_owner_depth;

	} die = {

		.lock =			SPIN_LOCK_UNLOCKED,

		.lock =			__SPIN_LOCK_UNLOCKED(die.lock),

		.lock_owner =		-1,

		.lock_owner_depth =	0

	};

include/asm-i386/rwsem.h

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ struct rw_semaphore { 




#define __RWSEM_INITIALIZER(name) \

{ RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) \

	__RWSEM_DEP_MAP_INIT(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)

include/linux/init_task.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
extern struct nsproxy init_nsproxy;

#define INIT_NSPROXY(nsproxy) {						\

	.count		= ATOMIC_INIT(1),				\

	.nslock		= SPIN_LOCK_UNLOCKED,				\

	.nslock		= __SPIN_LOCK_UNLOCKED(nsproxy.nslock),		\

	.uts_ns		= &init_uts_ns,					\

	.namespace	= NULL,						\

	INIT_IPC_NS(ipc_ns)						\

include/linux/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ do { \ 


#define __MUTEX_INITIALIZER(lockname) \

		{ .count = ATOMIC_INIT(1) \

		, .wait_lock = SPIN_LOCK_UNLOCKED \

		, .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \

		, .wait_list = LIST_HEAD_INIT(lockname.wait_list) \

		__DEBUG_MUTEX_INITIALIZER(lockname) \

		__DEP_MAP_MUTEX_INITIALIZER(lockname) }

include/linux/rtmutex.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct hrtimer_sleeper; 
#endif



#define __RT_MUTEX_INITIALIZER(mutexname) \

	{ .wait_lock = SPIN_LOCK_UNLOCKED \

	{ .wait_lock = __SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \

	, .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \

	, .owner = NULL \

	__DEBUG_RT_MUTEX_INITIALIZER(mutexname)}