Commit 179b9145 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of...

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: Resume clocksource without taking the clocksource mutex
parents 4187e7e9 89133f93
...@@ -394,15 +394,11 @@ void clocksource_resume(void) ...@@ -394,15 +394,11 @@ void clocksource_resume(void)
{ {
struct clocksource *cs; struct clocksource *cs;
mutex_lock(&clocksource_mutex);
list_for_each_entry(cs, &clocksource_list, list) list_for_each_entry(cs, &clocksource_list, list)
if (cs->resume) if (cs->resume)
cs->resume(); cs->resume();
clocksource_resume_watchdog(); clocksource_resume_watchdog();
mutex_unlock(&clocksource_mutex);
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment