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

Commit 3fca96ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v2.6.25-rc3-lockdep' of... 

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

* 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
  Subject: lockdep: include all lock classes in all_lock_classes
  lockdep: increase MAX_LOCK_DEPTH
parents 98c1fc93 1481197b

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ struct task_struct { 
	int softirq_context;

#endif

#ifdef CONFIG_LOCKDEP

# define MAX_LOCK_DEPTH 30UL

# define MAX_LOCK_DEPTH 48UL

	u64 curr_chain_key;

	int lockdep_depth;

	struct held_lock held_locks[MAX_LOCK_DEPTH];

kernel/lockdep.c

+4 −4
Original line number Diff line number Diff line
@@ -779,6 +779,10 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force) 
	 * parallel walking of the hash-list safe:

	 */

	list_add_tail_rcu(&class->hash_entry, hash_head);

	/*

	 * Add it to the global list of classes:

	 */

	list_add_tail_rcu(&class->lock_entry, &all_lock_classes);



	if (verbose(class)) {

		graph_unlock();
@@ -2282,10 +2286,6 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this, 
			return 0;

		break;

	case LOCK_USED:

		/*

		 * Add it to the global list of classes:

		 */

		list_add_tail_rcu(&this->class->lock_entry, &all_lock_classes);

		debug_atomic_dec(&nr_unused_locks);

		break;

	default: