diff options
| author | Tejun Heo <[email protected]> | 2012-08-08 11:10:26 -0700 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2012-08-21 16:28:30 +0200 |
| commit | 5a9af38d05f6a1bd0d3f1f69a074cdbe9c87e977 (patch) | |
| tree | 8dc923e5f94caaf014b06c887bb65181c38e22cf | |
| parent | e52b1db37b89b69ceb08b521a808bd2cf4724481 (diff) | |
timer: Relocate declarations of init_timer_on_stack_key()
init_timer_on_stack_key() is used by init macro definitions. Move
init_timer_on_stack_key() and destroy_timer_on_stack() declarations
above init macro defs. This will make the next init cleanup patch
easier to read.
Signed-off-by: Tejun Heo <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
| -rw-r--r-- | include/linux/timer.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index cbd32ec4dd15..1d364aed1802 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -97,6 +97,21 @@ void init_timer_deferrable_key(struct timer_list *timer, const char *name, struct lock_class_key *key); +#ifdef CONFIG_DEBUG_OBJECTS_TIMERS +extern void init_timer_on_stack_key(struct timer_list *timer, + const char *name, + struct lock_class_key *key); +extern void destroy_timer_on_stack(struct timer_list *timer); +#else +static inline void destroy_timer_on_stack(struct timer_list *timer) { } +static inline void init_timer_on_stack_key(struct timer_list *timer, + const char *name, + struct lock_class_key *key) +{ + init_timer_key(timer, name, key); +} +#endif + #ifdef CONFIG_LOCKDEP #define init_timer(timer) \ do { \ @@ -150,21 +165,6 @@ void init_timer_deferrable_key(struct timer_list *timer, setup_deferrable_timer_on_stack_key((timer), NULL, NULL, (fn), (data)) #endif -#ifdef CONFIG_DEBUG_OBJECTS_TIMERS -extern void init_timer_on_stack_key(struct timer_list *timer, - const char *name, - struct lock_class_key *key); -extern void destroy_timer_on_stack(struct timer_list *timer); -#else -static inline void destroy_timer_on_stack(struct timer_list *timer) { } -static inline void init_timer_on_stack_key(struct timer_list *timer, - const char *name, - struct lock_class_key *key) -{ - init_timer_key(timer, name, key); -} -#endif - static inline void setup_timer_key(struct timer_list * timer, const char *name, struct lock_class_key *key, |