Merge branch 'v2.6.25-rc3-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Feb 2008 15:49:15 +0000 (07:49 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 26 Feb 2008 15:49:15 +0000 (07:49 -0800)
* '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

1  2 
include/linux/sched.h

diff --combined include/linux/sched.h
index 9c17e828d6d4f14ea2734aec19e97bb6afe456d9,e3ea12437547df77f5f2ad82697e32965fcaf96f..2c9621f8bf872a2224482e509069226f9d08fd30
@@@ -242,7 -242,6 +242,7 @@@ struct task_struct
  
  extern void sched_init(void);
  extern void sched_init_smp(void);
 +extern asmlinkage void schedule_tail(struct task_struct *prev);
  extern void init_idle(struct task_struct *idle, int cpu);
  extern void init_idle_bootup_task(struct task_struct *idle);
  
@@@ -1190,7 -1189,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];