aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/time.c2
-rw-r--r--arch/x86/kernel/hpet.c2
-rw-r--r--arch/x86/kernel/tsc.c2
-rw-r--r--include/linux/clocksource.h2
-rw-r--r--kernel/time/clocksource.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index a35c661e5e89..47a192781b0a 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -61,7 +61,7 @@ unsigned long long sched_clock(void)
61 61
62#ifdef CONFIG_PARAVIRT 62#ifdef CONFIG_PARAVIRT
63static void 63static void
64paravirt_clocksource_resume(void) 64paravirt_clocksource_resume(struct clocksource *cs)
65{ 65{
66 if (pv_time_ops.clocksource_resume) 66 if (pv_time_ops.clocksource_resume)
67 pv_time_ops.clocksource_resume(); 67 pv_time_ops.clocksource_resume();
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)
266 force_hpet_resume(); 266 force_hpet_resume();
267} 267}
268 268
269static void hpet_resume_counter(void) 269static void hpet_resume_counter(struct clocksource *cs)
270{ 270{
271 hpet_resume_device(); 271 hpet_resume_device();
272 hpet_restart_counter(); 272 hpet_restart_counter();
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)
740} 740}
741#endif 741#endif
742 742
743static void resume_tsc(void) 743static void resume_tsc(struct clocksource *cs)
744{ 744{
745 clocksource_tsc.cycle_last = 0; 745 clocksource_tsc.cycle_last = 0;
746} 746}
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 8a4a130cc196..0de7e72c3995 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -172,7 +172,7 @@ struct clocksource {
172 u64 max_idle_ns; 172 u64 max_idle_ns;
173 unsigned long flags; 173 unsigned long flags;
174 cycle_t (*vread)(void); 174 cycle_t (*vread)(void);
175 void (*resume)(void); 175 void (*resume)(struct clocksource *cs);
176#ifdef CONFIG_IA64 176#ifdef CONFIG_IA64
177 void *fsys_mmio; /* used by fsyscall asm code */ 177 void *fsys_mmio; /* used by fsyscall asm code */
178#define CLKSRC_FSYS_MMIO_SET(mmio, addr) ((mmio) = (addr)) 178#define CLKSRC_FSYS_MMIO_SET(mmio, addr) ((mmio) = (addr))
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)
449 449
450 list_for_each_entry(cs, &clocksource_list, list) 450 list_for_each_entry(cs, &clocksource_list, list)
451 if (cs->resume) 451 if (cs->resume)
452 cs->resume(); 452 cs->resume(cs);
453 453
454 clocksource_resume_watchdog(); 454 clocksource_resume_watchdog();
455} 455}