diff options
Diffstat (limited to 'kernel/time/clocksource.c')
-rw-r--r-- | kernel/time/clocksource.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index a0af4ffcb6e5..5697155f1868 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -123,10 +123,12 @@ static DEFINE_MUTEX(clocksource_mutex); | |||
123 | static char override_name[32]; | 123 | static char override_name[32]; |
124 | 124 | ||
125 | #ifdef CONFIG_CLOCKSOURCE_WATCHDOG | 125 | #ifdef CONFIG_CLOCKSOURCE_WATCHDOG |
126 | static void clocksource_watchdog_work(struct work_struct *work); | ||
127 | |||
126 | static LIST_HEAD(watchdog_list); | 128 | static LIST_HEAD(watchdog_list); |
127 | static struct clocksource *watchdog; | 129 | static struct clocksource *watchdog; |
128 | static struct timer_list watchdog_timer; | 130 | static struct timer_list watchdog_timer; |
129 | static struct work_struct watchdog_work; | 131 | static DECLARE_WORK(watchdog_work, clocksource_watchdog_work); |
130 | static DEFINE_SPINLOCK(watchdog_lock); | 132 | static DEFINE_SPINLOCK(watchdog_lock); |
131 | static cycle_t watchdog_last; | 133 | static cycle_t watchdog_last; |
132 | static int watchdog_running; | 134 | static int watchdog_running; |
@@ -257,7 +259,6 @@ static inline void clocksource_start_watchdog(void) | |||
257 | { | 259 | { |
258 | if (watchdog_running || !watchdog || list_empty(&watchdog_list)) | 260 | if (watchdog_running || !watchdog || list_empty(&watchdog_list)) |
259 | return; | 261 | return; |
260 | INIT_WORK(&watchdog_work, clocksource_watchdog_work); | ||
261 | init_timer(&watchdog_timer); | 262 | init_timer(&watchdog_timer); |
262 | watchdog_timer.function = clocksource_watchdog; | 263 | watchdog_timer.function = clocksource_watchdog; |
263 | watchdog_last = watchdog->read(watchdog); | 264 | watchdog_last = watchdog->read(watchdog); |