diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-16 17:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-16 17:16:07 -0700 |
| commit | 406703f8de33bed0d34c6a083d58178317e27183 (patch) | |
| tree | 9b63d1fc0ffbb59d007309b785ce6a04cd9a22f8 /kernel/lockdep_internals.h | |
| parent | c100548d4610f727b95faffd69cb54cb280cd114 (diff) | |
| parent | df60a8441866153d691ae69b77934904c2de5e0d (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: fix build if CONFIG_PROVE_LOCKING not defined
lockdep: use WARN() in kernel/lockdep.c
lockdep: spin_lock_nest_lock(), checkpatch fixes
lockdep: build fix
Diffstat (limited to 'kernel/lockdep_internals.h')
| -rw-r--r-- | kernel/lockdep_internals.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h index 55db193d366..56b196932c0 100644 --- a/kernel/lockdep_internals.h +++ b/kernel/lockdep_internals.h @@ -50,8 +50,21 @@ extern unsigned int nr_process_chains; extern unsigned int max_lockdep_depth; extern unsigned int max_recursion_depth; +#ifdef CONFIG_PROVE_LOCKING extern unsigned long lockdep_count_forward_deps(struct lock_class *); extern unsigned long lockdep_count_backward_deps(struct lock_class *); +#else +static inline unsigned long +lockdep_count_forward_deps(struct lock_class *class) +{ + return 0; +} +static inline unsigned long +lockdep_count_backward_deps(struct lock_class *class) +{ + return 0; +} +#endif #ifdef CONFIG_DEBUG_LOCKDEP /* |