]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/blob - rt-patches/0256-kernel-time-timer-SMP-n-fix.patch
WAR:media:i2c:ov5693: add flip and mirror setting
[hercules2020/nv-tegra/linux-4.4.git] / rt-patches / 0256-kernel-time-timer-SMP-n-fix.patch
1 From d1eaf31637fd08ad11af59e4776eb10f1c4a1d8f Mon Sep 17 00:00:00 2001
2 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
3 Date: Wed, 13 Jan 2016 17:42:54 +0100
4 Subject: [PATCH 256/365] kernel/time/timer: SMP=n fix
5
6 Reported-by: Grygorii Strashko <grygorii.strashko@ti.com>
7 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
8 ---
9  kernel/time/timer.c | 2 +-
10  1 file changed, 1 insertion(+), 1 deletion(-)
11
12 diff --git a/kernel/time/timer.c b/kernel/time/timer.c
13 index c3314fc..a460cbb 100644
14 --- a/kernel/time/timer.c
15 +++ b/kernel/time/timer.c
16 @@ -1118,7 +1118,7 @@ int try_to_del_timer_sync(struct timer_list *timer)
17  }
18  EXPORT_SYMBOL(try_to_del_timer_sync);
19  
20 -#ifdef CONFIG_SMP
21 +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
22  /**
23   * del_timer_sync - deactivate a timer and wait for the handler to finish.
24   * @timer: the timer to be deactivated
25 -- 
26 2.7.4
27