diff options
Diffstat (limited to 'kernel/lockdep.c')
-rw-r--r-- | kernel/lockdep.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 54cc0dc7b303..e69d633d6aa6 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
@@ -431,6 +431,7 @@ unsigned int max_lockdep_depth; | |||
431 | * about it later on, in lockdep_info(). | 431 | * about it later on, in lockdep_info(). |
432 | */ | 432 | */ |
433 | static int lockdep_init_error; | 433 | static int lockdep_init_error; |
434 | static const char *lock_init_error; | ||
434 | static unsigned long lockdep_init_trace_data[20]; | 435 | static unsigned long lockdep_init_trace_data[20]; |
435 | static struct stack_trace lockdep_init_trace = { | 436 | static struct stack_trace lockdep_init_trace = { |
436 | .max_entries = ARRAY_SIZE(lockdep_init_trace_data), | 437 | .max_entries = ARRAY_SIZE(lockdep_init_trace_data), |
@@ -657,6 +658,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass) | |||
657 | if (unlikely(!lockdep_initialized)) { | 658 | if (unlikely(!lockdep_initialized)) { |
658 | lockdep_init(); | 659 | lockdep_init(); |
659 | lockdep_init_error = 1; | 660 | lockdep_init_error = 1; |
661 | lock_init_error = lock->name; | ||
660 | save_stack_trace(&lockdep_init_trace); | 662 | save_stack_trace(&lockdep_init_trace); |
661 | } | 663 | } |
662 | #endif | 664 | #endif |
@@ -3978,7 +3980,8 @@ void __init lockdep_info(void) | |||
3978 | 3980 | ||
3979 | #ifdef CONFIG_DEBUG_LOCKDEP | 3981 | #ifdef CONFIG_DEBUG_LOCKDEP |
3980 | if (lockdep_init_error) { | 3982 | if (lockdep_init_error) { |
3981 | printk("WARNING: lockdep init error! Arch code didn't call lockdep_init() early enough?\n"); | 3983 | printk("WARNING: lockdep init error! lock-%s was acquired" |
3984 | "before lockdep_init\n", lock_init_error); | ||
3982 | printk("Call stack leading to lockdep invocation was:\n"); | 3985 | printk("Call stack leading to lockdep invocation was:\n"); |
3983 | print_stack_trace(&lockdep_init_trace, 0); | 3986 | print_stack_trace(&lockdep_init_trace, 0); |
3984 | } | 3987 | } |