diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-26 14:29:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-26 14:29:35 -0400 |
| commit | 8f404faa72f4e458e7bd81ac75ce55ae829e953d (patch) | |
| tree | 46b70d6d86fc619343b4986160bda5e46b86bb18 /kernel/time/clocksource.c | |
| parent | 729eb528c7e10a4828fece102872ec5255946f64 (diff) | |
| parent | 06d8308c61e54346585b2691c13ee3f90cb6fb2f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
NOHZ: reevaluate idle sleep length after add_timer_on()
clocksource: revert: use init_timer_deferrable for clocksource_watchdog
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 278534bbca95..7f60097d443a 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -174,7 +174,7 @@ static void clocksource_check_watchdog(struct clocksource *cs) | |||
| 174 | if (watchdog) | 174 | if (watchdog) |
| 175 | del_timer(&watchdog_timer); | 175 | del_timer(&watchdog_timer); |
| 176 | watchdog = cs; | 176 | watchdog = cs; |
| 177 | init_timer_deferrable(&watchdog_timer); | 177 | init_timer(&watchdog_timer); |
| 178 | watchdog_timer.function = clocksource_watchdog; | 178 | watchdog_timer.function = clocksource_watchdog; |
| 179 | 179 | ||
| 180 | /* Reset watchdog cycles */ | 180 | /* Reset watchdog cycles */ |