Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix-timers.c: Don't export local functions clocksource: start CMT at clocksource resume clocksource: add suspend callback clocksource: add argument to resume callback ntp: Cleanup xtime references in ntp.c ntp: Make time_esterror and time_maxerror static
This commit is contained in:
@@ -452,6 +452,18 @@ static inline int clocksource_watchdog_kthread(void *data) { return 0; }
|
||||
|
||||
#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
|
||||
|
||||
/**
|
||||
* clocksource_suspend - suspend the clocksource(s)
|
||||
*/
|
||||
void clocksource_suspend(void)
|
||||
{
|
||||
struct clocksource *cs;
|
||||
|
||||
list_for_each_entry_reverse(cs, &clocksource_list, list)
|
||||
if (cs->suspend)
|
||||
cs->suspend(cs);
|
||||
}
|
||||
|
||||
/**
|
||||
* clocksource_resume - resume the clocksource(s)
|
||||
*/
|
||||
@@ -461,7 +473,7 @@ void clocksource_resume(void)
|
||||
|
||||
list_for_each_entry(cs, &clocksource_list, list)
|
||||
if (cs->resume)
|
||||
cs->resume();
|
||||
cs->resume(cs);
|
||||
|
||||
clocksource_resume_watchdog();
|
||||
}
|
||||
|
Reference in New Issue
Block a user