summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJoonwoo Park2015-04-28 04:21:49 +0200
committerThomas Gleixner2015-05-05 10:40:43 +0200
commit781978e6e156101209f62b9ebc8783b70ef248de (patch)
treed2f8286d9e396294abe3bcd782cefd03dcf4afb5 /kernel
parentclocksource: sun5i: Fix of_io_request_and_map error check (diff)
downloadkernel-qcow2-linux-781978e6e156101209f62b9ebc8783b70ef248de.tar.gz
kernel-qcow2-linux-781978e6e156101209f62b9ebc8783b70ef248de.tar.xz
kernel-qcow2-linux-781978e6e156101209f62b9ebc8783b70ef248de.zip
timer: Use timer->base for flag checks
At present, internal_add_timer() examines flags with 'base' which doesn't contain flags. Examine with 'timer->base' to avoid unnecessary waking up of nohz CPU when timer base has TIMER_DEFERRABLE set. Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org> Cc: sboyd@codeaurora.org Cc: skannan@codeaurora.org Cc: John Stultz <john.stultz@linaro.org> Link: http://lkml.kernel.org/r/1430187709-21087-1-git-send-email-joonwoop@codeaurora.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 03f926c7a8ee..d4af7c56c95d 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -436,7 +436,7 @@ static void internal_add_timer(struct tvec_base *base, struct timer_list *timer)
* require special care against races with idle_cpu(), lets deal
* with that later.
*/
- if (!tbase_get_deferrable(base) || tick_nohz_full_cpu(base->cpu))
+ if (!tbase_get_deferrable(timer->base) || tick_nohz_full_cpu(base->cpu))
wake_up_nohz_cpu(base->cpu);
}