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

Commit d8c89eb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v2.6.24-rc7-lockdep' of... 

Merge branch 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep

* 'v2.6.24-rc7-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  lockdep: more hardirq annotations for notify_die()
  lockdep: fix workqueue creation API lockdep interaction
  lockdep: fix internal double unlock during self-test
parents 456ef155 fb1dac90

arch/x86/kernel/traps_32.c

+1 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \ 
	info.si_errno = 0; \

	info.si_code = sicode; \

	info.si_addr = (void __user *)siaddr; \

	trace_hardirqs_fixup(); \

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \

						== NOTIFY_STOP) \

		return; \

arch/x86/kernel/traps_64.c

+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \ 
	info.si_errno = 0; \

	info.si_code = sicode; \

	info.si_addr = (void __user *)siaddr; \

	trace_hardirqs_fixup(); \

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \

							== NOTIFY_STOP) \

		return; \

include/linux/workqueue.h

+11 −3
Original line number Diff line number Diff line
@@ -149,19 +149,27 @@ struct execute_work { 


extern struct workqueue_struct *

__create_workqueue_key(const char *name, int singlethread,

		       int freezeable, struct lock_class_key *key);

		       int freezeable, struct lock_class_key *key,

		       const char *lock_name);



#ifdef CONFIG_LOCKDEP

#define __create_workqueue(name, singlethread, freezeable)	\

({								\

	static struct lock_class_key __key;			\

	const char *__lock_name;				\

								\

	if (__builtin_constant_p(name))				\

		__lock_name = (name);				\

	else							\

		__lock_name = #name;				\

								\

	__create_workqueue_key((name), (singlethread),		\

			       (freezeable), &__key);		\

			       (freezeable), &__key,		\

			       __lock_name);			\

})

#else

#define __create_workqueue(name, singlethread, freezeable)	\

	__create_workqueue_key((name), (singlethread), (freezeable), NULL)

	__create_workqueue_key((name), (singlethread), (freezeable), NULL, NULL)

#endif



#define create_workqueue(name) __create_workqueue((name), 0, 0)

kernel/lockdep.c

+8 −4
Original line number Diff line number Diff line
@@ -2943,9 +2943,10 @@ void lockdep_free_key_range(void *start, unsigned long size) 
	struct list_head *head;

	unsigned long flags;

	int i;

	int locked;



	raw_local_irq_save(flags);

	graph_lock();

	locked = graph_lock();



	/*

	 * Unhash all classes that were created by this module:
@@ -2959,6 +2960,7 @@ void lockdep_free_key_range(void *start, unsigned long size) 
				zap_class(class);

	}



	if (locked)

		graph_unlock();

	raw_local_irq_restore(flags);

}
@@ -2969,6 +2971,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
	struct list_head *head;

	unsigned long flags;

	int i, j;

	int locked;



	raw_local_irq_save(flags);
@@ -2987,7 +2990,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
	 * Debug check: in the end all mapped classes should

	 * be gone.

	 */

	graph_lock();

	locked = graph_lock();

	for (i = 0; i < CLASSHASH_SIZE; i++) {

		head = classhash_table + i;

		if (list_empty(head))
@@ -3000,6 +3003,7 @@ void lockdep_reset_lock(struct lockdep_map *lock) 
			}

		}

	}

	if (locked)

		graph_unlock();



out_restore:

kernel/workqueue.c

+3 −2
Original line number Diff line number Diff line
@@ -722,7 +722,8 @@ static void start_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) 
struct workqueue_struct *__create_workqueue_key(const char *name,

						int singlethread,

						int freezeable,

						struct lock_class_key *key)

						struct lock_class_key *key,

						const char *lock_name)

{

	struct workqueue_struct *wq;

	struct cpu_workqueue_struct *cwq;
@@ -739,7 +740,7 @@ struct workqueue_struct *__create_workqueue_key(const char *name, 
	}



	wq->name = name;

	lockdep_init_map(&wq->lockdep_map, name, key, 0);

	lockdep_init_map(&wq->lockdep_map, lock_name, key, 0);

	wq->singlethread = singlethread;

	wq->freezeable = freezeable;

	INIT_LIST_HEAD(&wq->list);