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>
This commit is contained in:
parent
7e1b584774
commit
17622339af
|
@ -61,7 +61,7 @@ unsigned long long sched_clock(void)
|
|||
|
||||
#ifdef CONFIG_PARAVIRT
|
||||
static void
|
||||
paravirt_clocksource_resume(void)
|
||||
paravirt_clocksource_resume(struct clocksource *cs)
|
||||
{
|
||||
if (pv_time_ops.clocksource_resume)
|
||||
pv_time_ops.clocksource_resume();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -172,7 +172,7 @@ struct clocksource {
|
|||
u64 max_idle_ns;
|
||||
unsigned long flags;
|
||||
cycle_t (*vread)(void);
|
||||
void (*resume)(void);
|
||||
void (*resume)(struct clocksource *cs);
|
||||
#ifdef CONFIG_IA64
|
||||
void *fsys_mmio; /* used by fsyscall asm code */
|
||||
#define CLKSRC_FSYS_MMIO_SET(mmio, addr) ((mmio) = (addr))
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue