diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-26 10:49:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-26 10:49:15 -0500 |
| commit | 3fca96eed1cc9fb524aec536bba8ae921563f1bb (patch) | |
| tree | 474cdcc572b3433f01f221ea8857414bde53b7a2 /include/linux/sched.h | |
| parent | 98c1fc934c097d84dc30c639e9bdb0b992ef53e2 (diff) | |
| parent | 1481197b50114d7212d659d41cb97f31a8934883 (diff) | |
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
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9c17e828d6d4..2c9621f8bf87 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1190,7 +1190,7 @@ struct task_struct { | |||
| 1190 | int softirq_context; | 1190 | int softirq_context; |
| 1191 | #endif | 1191 | #endif |
| 1192 | #ifdef CONFIG_LOCKDEP | 1192 | #ifdef CONFIG_LOCKDEP |
| 1193 | # define MAX_LOCK_DEPTH 30UL | 1193 | # define MAX_LOCK_DEPTH 48UL |
| 1194 | u64 curr_chain_key; | 1194 | u64 curr_chain_key; |
| 1195 | int lockdep_depth; | 1195 | int lockdep_depth; |
| 1196 | struct held_lock held_locks[MAX_LOCK_DEPTH]; | 1196 | struct held_lock held_locks[MAX_LOCK_DEPTH]; |