summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 92d8af4b5..6b8538715 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -163,9 +163,9 @@ static inline void internal_add_timer(struct timer_list *timer)
/* Initialize both explicitly - let's try to have them in the same cache line */
spinlock_t timerlist_lock = SPIN_LOCK_UNLOCKED;
-volatile struct timer_list * volatile running_timer = NULL;
#ifdef CONFIG_SMP
+volatile struct timer_list * volatile running_timer = NULL;
#define timer_enter(t) do { running_timer = t; mb(); } while (0)
#define timer_exit() do { running_timer = NULL; } while (0)
#define timer_is_running(t) (running_timer == t)
@@ -173,8 +173,6 @@ volatile struct timer_list * volatile running_timer = NULL;
#else
#define timer_enter(t) do { } while (0)
#define timer_exit() do { } while (0)
-#define timer_is_running(t) (0)
-#define timer_synchronize(t) do { (void)(t); barrier(); } while(0)
#endif
void add_timer(struct timer_list *timer)