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

Commit eb4542b9 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate waitqueues 



Create one lock class for all waitqueue locks in the kernel.  Has no effect on
non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 243c7621

include/linux/wait.h

+6 −0
Original line number Diff line number Diff line
@@ -77,9 +77,15 @@ struct task_struct; 
#define __WAIT_BIT_KEY_INITIALIZER(word, bit)				\

	{ .flags = word, .bit_nr = bit, }



/*

 * lockdep: we want one lock-class for all waitqueue locks.

 */

extern struct lock_class_key waitqueue_lock_key;



static inline void init_waitqueue_head(wait_queue_head_t *q)

{

	spin_lock_init(&q->lock);

	lockdep_set_class(&q->lock, &waitqueue_lock_key);

	INIT_LIST_HEAD(&q->task_list);

}

kernel/wait.c

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 
#include <linux/wait.h>

#include <linux/hash.h>



struct lock_class_key waitqueue_lock_key;



EXPORT_SYMBOL(waitqueue_lock_key);



void fastcall add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait)

{

	unsigned long flags;