summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/tsc.c
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 /arch/x86/kernel/tsc.c
parent7e1b584774c6168ca5b27c340fbeff8f67651e4f (diff)
downloadblackbird-op-linux-17622339af2536b32cf29699ddd4ba0fe79a61d5.tar.gz
blackbird-op-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 'arch/x86/kernel/tsc.c')
-rw-r--r--arch/x86/kernel/tsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 597683aa5ba0..9eeb9be26aa4 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -740,7 +740,7 @@ static cycle_t __vsyscall_fn vread_tsc(void)
}
#endif
-static void resume_tsc(void)
+static void resume_tsc(struct clocksource *cs)
{
clocksource_tsc.cycle_last = 0;
}
OpenPOWER on IntegriCloud