summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-02-02 14:41:39 -0800
committerThomas Gleixner <tglx@linutronix.de>2010-02-05 14:54:10 +0100
commit17622339af2536b32cf29699ddd4ba0fe79a61d5 (patch)
tree03832ecc8aecd1623b8dc8a8eef915cea08226e4 /kernel/time
parent7e1b584774c6168ca5b27c340fbeff8f67651e4f (diff)
downloadlinux-17622339af2536b32cf29699ddd4ba0fe79a61d5.tar.gz
linux-17622339af2536b32cf29699ddd4ba0fe79a61d5.tar.bz2
linux-17622339af2536b32cf29699ddd4ba0fe79a61d5.zip
clocksource: add argument to resume callback
Pass the clocksource as an argument to the clocksource resume callback. Needed so we can point out which CMT channel the sh_cmt.c driver shall resume. Signed-off-by: Magnus Damm <damm@opensource.se> Cc: john stultz <johnstul@us.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/clocksource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index e85c23404d34..08adacb2a1ed 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -449,7 +449,7 @@ void clocksource_resume(void)
list_for_each_entry(cs, &clocksource_list, list)
if (cs->resume)
- cs->resume();
+ cs->resume(cs);
clocksource_resume_watchdog();
}