Skip to content

Commit

Permalink
clocksource: add argument to resume callback
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Thomas Gleixner committed Feb 5, 2010
1 parent 7e1b584 commit 1762233
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/ia64/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/tsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion include/linux/clocksource.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion kernel/time/clocksource.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit 1762233

Please sign in to comment.