diff options
| -rw-r--r-- | include/linux/timer.h | 7 | ||||
| -rw-r--r-- | kernel/time/timer.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 8e027cb10df0..a9c20a7ead30 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -171,12 +171,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires); extern void add_timer(struct timer_list *timer); extern int try_to_del_timer_sync(struct timer_list *timer); - -#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT) - extern int del_timer_sync(struct timer_list *timer); -#else -# define del_timer_sync(t) del_timer(t) -#endif +extern int del_timer_sync(struct timer_list *timer); #define del_singleshot_timer_sync(t) del_timer_sync(t) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index f63efe259ae4..489bb01796de 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1349,7 +1349,6 @@ static inline void timer_sync_wait_running(struct timer_base *base) { } static inline void del_timer_wait_running(struct timer_list *timer) { } #endif -#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT) /** * del_timer_sync - Deactivate a timer and wait for the handler to finish. * @timer: The timer to be deactivated @@ -1423,7 +1422,6 @@ int del_timer_sync(struct timer_list *timer) return ret; } EXPORT_SYMBOL(del_timer_sync); -#endif static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *), |