diff options
Diffstat (limited to 'include/linux/lockdep.h')
-rw-r--r-- | include/linux/lockdep.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 6fc77d4dbdcd..a8113357ceeb 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h | |||
@@ -266,7 +266,8 @@ struct held_lock { | |||
266 | /* | 266 | /* |
267 | * Initialization, self-test and debugging-output methods: | 267 | * Initialization, self-test and debugging-output methods: |
268 | */ | 268 | */ |
269 | extern void lockdep_info(void); | 269 | extern void lockdep_init(void); |
270 | extern void lockdep_init_early(void); | ||
270 | extern void lockdep_reset(void); | 271 | extern void lockdep_reset(void); |
271 | extern void lockdep_reset_lock(struct lockdep_map *lock); | 272 | extern void lockdep_reset_lock(struct lockdep_map *lock); |
272 | extern void lockdep_free_key_range(void *start, unsigned long size); | 273 | extern void lockdep_free_key_range(void *start, unsigned long size); |
@@ -406,7 +407,8 @@ static inline void lockdep_on(void) | |||
406 | # define lock_downgrade(l, i) do { } while (0) | 407 | # define lock_downgrade(l, i) do { } while (0) |
407 | # define lock_set_class(l, n, k, s, i) do { } while (0) | 408 | # define lock_set_class(l, n, k, s, i) do { } while (0) |
408 | # define lock_set_subclass(l, s, i) do { } while (0) | 409 | # define lock_set_subclass(l, s, i) do { } while (0) |
409 | # define lockdep_info() do { } while (0) | 410 | # define lockdep_init() do { } while (0) |
411 | # define lockdep_init_early() do { } while (0) | ||
410 | # define lockdep_init_map(lock, name, key, sub) \ | 412 | # define lockdep_init_map(lock, name, key, sub) \ |
411 | do { (void)(name); (void)(key); } while (0) | 413 | do { (void)(name); (void)(key); } while (0) |
412 | # define lockdep_set_class(lock, key) do { (void)(key); } while (0) | 414 | # define lockdep_set_class(lock, key) do { (void)(key); } while (0) |
@@ -532,7 +534,7 @@ do { \ | |||
532 | 534 | ||
533 | #endif /* CONFIG_LOCKDEP */ | 535 | #endif /* CONFIG_LOCKDEP */ |
534 | 536 | ||
535 | #ifdef CONFIG_TRACE_IRQFLAGS | 537 | #ifdef CONFIG_PROVE_LOCKING |
536 | extern void print_irqtrace_events(struct task_struct *curr); | 538 | extern void print_irqtrace_events(struct task_struct *curr); |
537 | #else | 539 | #else |
538 | static inline void print_irqtrace_events(struct task_struct *curr) | 540 | static inline void print_irqtrace_events(struct task_struct *curr) |