Commit 179b9145 authored Sep 26, 2009 by Linus Torvalds

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

kernel/time/clocksource.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**