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

Commit 376f3bce authored by Kees Cook's avatar Kees Cook Committed by Thomas Gleixner
Browse files

x86/platform/UV: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Dimitri Sivanich <sivanich@hpe.com>
Cc: Russ Anderson <rja@hpe.com>
Cc: Mike Travis <mike.travis@hpe.com>
Link: https://lkml.kernel.org/r/20171016232231.GA100493@beast
parent 33d930e5

arch/x86/kernel/apic/x2apic_uv_x.c

+2 −3
Original line number Diff line number Diff line
@@ -920,9 +920,8 @@ static __init void uv_rtc_init(void) 
/*

 * percpu heartbeat timer

 */

static void uv_heartbeat(unsigned long ignored)

static void uv_heartbeat(struct timer_list *timer)

{

	struct timer_list *timer = &uv_scir_info->timer;

	unsigned char bits = uv_scir_info->state;



	/* Flip heartbeat bit: */
@@ -947,7 +946,7 @@ static int uv_heartbeat_enable(unsigned int cpu) 
		struct timer_list *timer = &uv_cpu_scir_info(cpu)->timer;



		uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY);

		setup_pinned_timer(timer, uv_heartbeat, cpu);

		timer_setup(timer, uv_heartbeat, TIMER_PINNED);

		timer->expires = jiffies + SCIR_CPU_HB_INTERVAL;

		add_timer_on(timer, cpu);

		uv_cpu_scir_info(cpu)->enabled = 1;