Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17622339 authored by Magnus Damm's avatar Magnus Damm Committed by Thomas Gleixner
Browse files

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: default avatarMagnus Damm <damm@opensource.se>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7e1b5847

arch/ia64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/x86/kernel/hpet.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/x86/kernel/tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

include/linux/clocksource.h

+1 −1
Original line number Diff line number Diff line
@@ -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))

kernel/time/clocksource.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

}