Commit 75b56ec2 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:
  lockdep: Fix lockdep_no_validate against IRQ states
  mutex: Make mutex_destroy() an inline function
  plist: Remove the need to supply locks to plist heads
  lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option
parents 6d16d6d9 efbe2eee

include/linux/mutex.h

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

							\

	__mutex_init((mutex), #mutex, &__key);		\

	__mutex_init((mutex), #mutex, &__key);		\

} while (0)

} while (0)

# define mutex_destroy(mutex)				do { } while (0)

static inline void mutex_destroy(struct mutex *lock) {}

#endif

#endif





#ifdef CONFIG_DEBUG_LOCK_ALLOC

#ifdef CONFIG_DEBUG_LOCK_ALLOC

include/linux/plist.h

+3 −52
Original line number Original line Diff line number Diff line
@@ -77,14 +77,9 @@ 




#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/list.h>

#include <linux/spinlock_types.h>





struct plist_head {

struct plist_head {

	struct list_head node_list;

	struct list_head node_list;

#ifdef CONFIG_DEBUG_PI_LIST

	raw_spinlock_t *rawlock;

	spinlock_t *spinlock;

#endif

};

};





struct plist_node {

struct plist_node {
@@ -93,37 +88,13 @@ struct plist_node { 
	struct list_head	node_list;

	struct list_head	node_list;

};

};





#ifdef CONFIG_DEBUG_PI_LIST

# define PLIST_HEAD_LOCK_INIT(_lock)		.spinlock = _lock

# define PLIST_HEAD_LOCK_INIT_RAW(_lock)	.rawlock = _lock

#else

# define PLIST_HEAD_LOCK_INIT(_lock)

# define PLIST_HEAD_LOCK_INIT_RAW(_lock)

#endif



#define _PLIST_HEAD_INIT(head)				\

	.node_list = LIST_HEAD_INIT((head).node_list)



/**

/**

 * PLIST_HEAD_INIT - static struct plist_head initializer

 * PLIST_HEAD_INIT - static struct plist_head initializer

 * @head:	struct plist_head variable name

 * @head:	struct plist_head variable name

 * @_lock:	lock to initialize for this list

 */

#define PLIST_HEAD_INIT(head, _lock)			\

{							\

	_PLIST_HEAD_INIT(head),				\

	PLIST_HEAD_LOCK_INIT(&(_lock))			\

}



/**

 * PLIST_HEAD_INIT_RAW - static struct plist_head initializer

 * @head:	struct plist_head variable name

 * @_lock:	lock to initialize for this list

 */

 */

#define PLIST_HEAD_INIT_RAW(head, _lock)		\

#define PLIST_HEAD_INIT(head)				\

{							\

{							\

	_PLIST_HEAD_INIT(head),				\

	.node_list = LIST_HEAD_INIT((head).node_list)	\

	PLIST_HEAD_LOCK_INIT_RAW(&(_lock))		\

}

}





/**

/**
@@ -141,31 +112,11 @@ struct plist_node { 
/**

/**

 * plist_head_init - dynamic struct plist_head initializer

 * plist_head_init - dynamic struct plist_head initializer

 * @head:	&struct plist_head pointer

 * @head:	&struct plist_head pointer

 * @lock:	spinlock protecting the list (debugging)

 */

 */

static inline void

static inline void

plist_head_init(struct plist_head *head, spinlock_t *lock)

plist_head_init(struct plist_head *head)

{

{

	INIT_LIST_HEAD(&head->node_list);

	INIT_LIST_HEAD(&head->node_list);

#ifdef CONFIG_DEBUG_PI_LIST

	head->spinlock = lock;

	head->rawlock = NULL;

#endif

}



/**

 * plist_head_init_raw - dynamic struct plist_head initializer

 * @head:	&struct plist_head pointer

 * @lock:	raw_spinlock protecting the list (debugging)

 */

static inline void

plist_head_init_raw(struct plist_head *head, raw_spinlock_t *lock)

{

	INIT_LIST_HEAD(&head->node_list);

#ifdef CONFIG_DEBUG_PI_LIST

	head->rawlock = lock;

	head->spinlock = NULL;

#endif

}

}





/**

/**

include/linux/rtmutex.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ struct hrtimer_sleeper; 




#define __RT_MUTEX_INITIALIZER(mutexname) \

#define __RT_MUTEX_INITIALIZER(mutexname) \

	{ .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \

	{ .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \

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

	, .wait_list = PLIST_HEAD_INIT(mutexname.wait_list) \

	, .owner = NULL \

	, .owner = NULL \

	__DEBUG_RT_MUTEX_INITIALIZER(mutexname)}

	__DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
@@ -100,7 +100,7 @@ extern void rt_mutex_unlock(struct rt_mutex *lock); 




#ifdef CONFIG_RT_MUTEXES

#ifdef CONFIG_RT_MUTEXES

# define INIT_RT_MUTEXES(tsk)						\

# define INIT_RT_MUTEXES(tsk)						\

	.pi_waiters	= PLIST_HEAD_INIT(tsk.pi_waiters, tsk.pi_lock),	\

	.pi_waiters	= PLIST_HEAD_INIT(tsk.pi_waiters),	\

	INIT_RT_MUTEX_DEBUG(tsk)

	INIT_RT_MUTEX_DEBUG(tsk)

#else

#else

# define INIT_RT_MUTEXES(tsk)

# define INIT_RT_MUTEXES(tsk)

kernel/fork.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1012,7 +1012,7 @@ static void rt_mutex_init_task(struct task_struct *p) 
{

{

	raw_spin_lock_init(&p->pi_lock);

	raw_spin_lock_init(&p->pi_lock);

#ifdef CONFIG_RT_MUTEXES

#ifdef CONFIG_RT_MUTEXES

	plist_head_init_raw(&p->pi_waiters, &p->pi_lock);

	plist_head_init(&p->pi_waiters);

	p->pi_blocked_on = NULL;

	p->pi_blocked_on = NULL;

#endif

#endif

}

}

kernel/futex.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2697,7 +2697,7 @@ static int __init futex_init(void) 
		futex_cmpxchg_enabled = 1;

		futex_cmpxchg_enabled = 1;





	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {

	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {

		plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);

		plist_head_init(&futex_queues[i].chain);

		spin_lock_init(&futex_queues[i].lock);

		spin_lock_init(&futex_queues[i].lock);

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE