diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 19:14:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 19:14:41 +0200 |
| commit | 179b9145d58eb7158d4053a8308b9fc4608a6d6b (patch) | |
| tree | 6f63a64c2811135e6edca885f5a2c79f50ba7465 /kernel | |
| parent | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | clocksource: Resume clocksource without taking the clocksource mutex (diff) | |
| download | linux-179b9145d58eb7158d4053a8308b9fc4608a6d6b.tar.xz linux-179b9145d58eb7158d4053a8308b9fc4608a6d6b.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/clocksource.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 09113347d328..5e18c6ab2c6a 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -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); } /** |