Patch "x86/platform/UV: Convert timers to use timer_setup()" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/platform/UV: Convert timers to use timer_setup()
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-platform-uv-convert-timers-to-use-timer_setup.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
376f3bcebdc999cc737d9052109cc33b573b3a8bMon Sep 17 00:00:00 2001
From: Kees Cook <[email protected]>
Date: Mon, 16 Oct 2017 16:22:31 -0700
Subject: x86/platform/UV: Convert timers to use timer_setup()
From: Kees Cook <[email protected]>
commit 376f3bcebdc999cc737d9052109cc33b573b3a8b upstream.
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.
--- 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(unsignedstruct 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 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/x86-platform-uv-convert-timers-to-use-timer_setup.patch queue-4.14/ptrace-x86-make-user_64bit_mode-available-to-32-bit-builds.patch