x86/platform/UV: Convert timers to use timer_setup()
Subsystems (2)
PATCH 1/1 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.
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Mike Travis <[email protected]>
Cc Dimitri Sivanich <[email protected]>
Cc Russ Anderson <[email protected]>
Signed-off-by Kees Cook <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +2 -3
@@ -911,9 +911,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: */
@@ -938,7 +937,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 ;
Signature · 6 lines
2.7.4 -- Kees Cook Pixel Security
tip-bot for Kees Cook
merge botx86/platform/UV: Convert timers to use timer_setup()
Commit-ID: 376f3bcebdc999cc737d9052109cc33b573b3a8b Gitweb: https://git.kernel.org/tip/376f3bcebdc999cc737d9052109cc33b573b3a8b Author: Kees Cook <[email protected]> AuthorDate: Mon, 16 Oct 2017 16:22:31 -0700 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 17 Oct 2017 17:40:06 +0200
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 Kees Cook <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc Dimitri Sivanich <[email protected]>
Cc Russ Anderson <[email protected]>
Cc Mike Travis <[email protected]>
--- arch/x86/kernel/apic/x2apic_uv_x.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/x2apic_uv_x.c +2 -3
@@ -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 ;