From: Andrew Morton Privatise this #define Cc: Venkatesh Pallipadi Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Oleg Nesterov Cc: Dave Jones Signed-off-by: Andrew Morton --- include/linux/timer.h | 6 ------ kernel/timer.c | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff -puN include/linux/timer.h~add-support-for-deferrable-timers-respun-tidy include/linux/timer.h --- a/include/linux/timer.h~add-support-for-deferrable-timers-respun-tidy +++ a/include/linux/timer.h @@ -9,12 +9,6 @@ struct tvec_t_base_s; extern struct tvec_t_base_s boot_tvec_bases; -/* - * Note that all tvec_bases is 2 byte aligned and lower bit of - * base in timer_list is guaranteed to be zero. Use the LSB for - * the new flag to indicate whether the timer is deferrable - */ -#define TBASE_DEFERRABLE_FLAG (0x1) struct timer_list { struct list_head entry; diff -puN kernel/timer.c~add-support-for-deferrable-timers-respun-tidy kernel/timer.c --- a/kernel/timer.c~add-support-for-deferrable-timers-respun-tidy +++ a/kernel/timer.c @@ -48,6 +48,13 @@ u64 jiffies_64 __cacheline_aligned_in_sm EXPORT_SYMBOL(jiffies_64); /* + * Note that all tvec_bases is 2 byte aligned and lower bit of base in + * timer_list is guaranteed to be zero. Use the LSB for the new flag to + * indicate whether the timer is deferrable + */ +#define TBASE_DEFERRABLE_FLAG (0x1) + +/* * per-CPU timer vector definitions: */ #define TVN_BITS (CONFIG_BASE_SMALL ? 4 : 6) _