diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-03 09:31:53 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-03 09:31:53 -0400 |
| commit | fceb15c41ef766a76d98afc1cb7797346f4ce48f (patch) | |
| tree | 0d8d4479b3a678d59c1c546cabf6f5b3a9df5ed7 | |
| parent | adbfcb32a56177575853583c2bdba42ddb104374 (diff) | |
| download | longterm-queue-4.12-fceb15c41ef766a76d98afc1cb7797346f4ce48f.tar.gz | |
x86: drop patch relying on timer_setup not in 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/queue/series b/queue/series index 3885604..c6c645d 100644 --- a/queue/series +++ b/queue/series @@ -1,5 +1,4 @@ ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch -x86-platform-UV-Convert-timers-to-use-timer_setup.patch posix-timer-Properly-check-sigevent-sigev_notify.patch optee-fix-invalid-of_node_put-in-optee_driver_init.patch backlight-pwm_bl-Fix-overflow-condition.patch diff --git a/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch b/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch deleted file mode 100644 index 93a7f31..0000000 --- a/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 60f9feecb017e708af34ec7b473c500b0e188333 Mon Sep 17 00:00:00 2001 -From: Kees Cook <keescook@chromium.org> -Date: Mon, 16 Oct 2017 16:22:31 -0700 -Subject: [PATCH] x86/platform/UV: Convert timers to use timer_setup() - -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. - -Signed-off-by: Kees Cook <keescook@chromium.org> -Signed-off-by: Thomas 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 -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c -index b487b3a01615..2f17c3919d0b 100644 ---- a/arch/x86/kernel/apic/x2apic_uv_x.c -+++ b/arch/x86/kernel/apic/x2apic_uv_x.c -@@ -932,9 +932,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: */ -@@ -959,7 +958,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; --- -2.15.0 - |