Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61643
b: refs/heads/master
c: c71063c
h: refs/heads/master
i:
  61641: 0427780
  61639: 352e60a
v: v3
  • Loading branch information
Johannes Berg authored and Linus Torvalds committed Jul 19, 2007
1 parent cf1ee0b commit 6d5ad78
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d38e1d5aaee384698fcef9455d6e2df1d062a1d0
refs/heads/master: c71063c9c9dc232d0d51f936f237f7dc5681e8e3
13 changes: 11 additions & 2 deletions trunk/kernel/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,11 @@ unsigned int max_recursion_depth;
* about it later on, in lockdep_info().
*/
static int lockdep_init_error;
static unsigned long lockdep_init_trace_data[20];
static struct stack_trace lockdep_init_trace = {
.max_entries = ARRAY_SIZE(lockdep_init_trace_data),
.entries = lockdep_init_trace_data,
};

/*
* Various lockdep statistics:
Expand Down Expand Up @@ -662,6 +667,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
if (unlikely(!lockdep_initialized)) {
lockdep_init();
lockdep_init_error = 1;
save_stack_trace(&lockdep_init_trace);
}
#endif

Expand Down Expand Up @@ -3040,8 +3046,11 @@ void __init lockdep_info(void)
sizeof(struct held_lock) * MAX_LOCK_DEPTH);

#ifdef CONFIG_DEBUG_LOCKDEP
if (lockdep_init_error)
printk("WARNING: lockdep init error! Arch code didnt call lockdep_init() early enough?\n");
if (lockdep_init_error) {
printk("WARNING: lockdep init error! Arch code didn't call lockdep_init() early enough?\n");
printk("Call stack leading to lockdep invocation was:\n");
print_stack_trace(&lockdep_init_trace, 0);
}
#endif
}

Expand Down

0 comments on commit 6d5ad78

Please sign in to comment.