Skip to content

Commit

Permalink
timer: Relocate declarations of init_timer_on_stack_key()
Browse files Browse the repository at this point in the history
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 <tj@kernel.org>
Cc: torvalds@linux-foundation.org
Cc: peterz@infradead.org
Link: http://lkml.kernel.org/r/1344449428-24962-3-git-send-email-tj@kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Tejun Heo authored and Thomas Gleixner committed Aug 21, 2012
1 parent e52b1db commit 5a9af38
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions include/linux/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 { \
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 5a9af38

Please sign in to comment.