lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

timer: Relocate declarations of init_timer_on_stack_key()

Browse Source 
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>
This commit is contained in:
Tejun Heo
2012-08-08 11:10:26 -07:00
committed by Thomas Gleixner
parent e52b1db37b
commit 5a9af38d05
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/linux/timer.h
View File

@@ -97,6 +97,21 @@ void init_timer_deferrable_key(struct timer_list *timer,
const char *name, const char *name,
struct lock_class_key *key); 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 #ifdef CONFIG_LOCKDEP
#define init_timer(timer) \ #define init_timer(timer) \
do { \ 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)) setup_deferrable_timer_on_stack_key((timer), NULL, NULL, (fn), (data))
#endif #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, static inline void setup_timer_key(struct timer_list * timer,
const char *name, const char *name,
struct lock_class_key *key, struct lock_class_key *key,