diff options
| author | Magnus Damm <damm@opensource.se> | 2010-02-02 14:41:39 -0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-05 14:54:10 +0100 |
| commit | 17622339af2536b32cf29699ddd4ba0fe79a61d5 (patch) | |
| tree | 03832ecc8aecd1623b8dc8a8eef915cea08226e4 /arch/x86/kernel/hpet.c | |
| parent | 7e1b584774c6168ca5b27c340fbeff8f67651e4f (diff) | |
| download | blackbird-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/hpet.c')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index ad80a1c718c6..ee4fa1bfcb33 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -266,7 +266,7 @@ static void hpet_resume_device(void) force_hpet_resume(); } -static void hpet_resume_counter(void) +static void hpet_resume_counter(struct clocksource *cs) { hpet_resume_device(); hpet_restart_counter(); |
