lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2008-02-26 07:49:15 -08:00
parent 98c1fc934c 1481197b50
commit 3fca96eed1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sched.h
View File

@@ -1190,7 +1190,7 @@ struct task_struct {
int softirq_context; int softirq_context;
#endif #endif
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
# define MAX_LOCK_DEPTH 30UL # define MAX_LOCK_DEPTH 48UL
u64 curr_chain_key; u64 curr_chain_key;
int lockdep_depth; int lockdep_depth;
struct held_lock held_locks[MAX_LOCK_DEPTH]; struct held_lock held_locks[MAX_LOCK_DEPTH];

8
kernel/lockdep.c
View File

@@ -779,6 +779,10 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
* parallel walking of the hash-list safe: * parallel walking of the hash-list safe:
*/ */
list_add_tail_rcu(&class->hash_entry, hash_head); 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)) { if (verbose(class)) {
graph_unlock(); graph_unlock();
@@ -2282,10 +2286,6 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
return 0; return 0;
break; break;
case LOCK_USED: 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); debug_atomic_dec(&nr_unused_locks);
break; break;
default: default: