Skip to content

Commit

Permalink
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed Sep 26, 2009
2 parents 4187e7e + 89133f9 commit 179b914
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions kernel/time/clocksource.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,11 @@ void clocksource_resume(void)
{
struct clocksource *cs;

mutex_lock(&clocksource_mutex);

list_for_each_entry(cs, &clocksource_list, list)
if (cs->resume)
cs->resume();

clocksource_resume_watchdog();

mutex_unlock(&clocksource_mutex);
}

/**
Expand Down

0 comments on commit 179b914

Please sign in to comment.