diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-03-24 23:42:45 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-24 23:42:45 -0400 |
| commit | e226e34165d6ea827fcbd6fbf4df49090c4d0dbc (patch) | |
| tree | 05d472b77db4e3dd68ea1277e0b966263040dcec /kernel/lockdep.c | |
| parent | 5bbcf5e6abe97485748b51ea0713cc3012b4a8f0 (diff) | |
| parent | cafe563591446cf80bfbc2fe3bc72a2e36cf1060 (diff) | |
Merge branch 'bcache-for-upstream' of http://evilpiepirate.org/git/linux-bcache into for-3.10/drivers
Diffstat (limited to 'kernel/lockdep.c')
| -rw-r--r-- | kernel/lockdep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 259db207b5d9..60248a78bec0 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
| @@ -2997,6 +2997,7 @@ void lockdep_init_map(struct lockdep_map *lock, const char *name, | |||
| 2997 | EXPORT_SYMBOL_GPL(lockdep_init_map); | 2997 | EXPORT_SYMBOL_GPL(lockdep_init_map); |
| 2998 | 2998 | ||
| 2999 | struct lock_class_key __lockdep_no_validate__; | 2999 | struct lock_class_key __lockdep_no_validate__; |
| 3000 | EXPORT_SYMBOL_GPL(__lockdep_no_validate__); | ||
| 3000 | 3001 | ||
| 3001 | static int | 3002 | static int |
| 3002 | print_lock_nested_lock_not_held(struct task_struct *curr, | 3003 | print_lock_nested_lock_not_held(struct task_struct *curr, |