summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-07-31 10:27:19 +0200
committerIngo Molnar <mingo@kernel.org>2015-07-31 10:28:53 +0200
commit555ee95a0a5a525ad2f1654fab0bd157de832b4f (patch)
tree5ff341bedaa848027d5eba1e2a9fbfaeb9501250 /kernel/sched
parent8400935737bf02d97da281bdcd139a421624b6ba (diff)
parentde734f89b67c2df30e35a09e7e56a3659e5b6ac6 (diff)
downloadop-kernel-dev-555ee95a0a5a525ad2f1654fab0bd157de832b4f.zip
op-kernel-dev-555ee95a0a5a525ad2f1654fab0bd157de832b4f.tar.gz
Merge branch 'timers/nohz-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
Pull NOHZ updates from Frederic Weisbecker: - Fix some jiffies based cputime assumptions. No real harm because the concerned code isn't used by full dynticks. - Simplify jiffies <-> usecs conversions. Remove dead code. - Remove early hacks on nohz full code that avoided messing up idle nohz internals. Now nohz integrates well full and idle and such hack have become needless. - Restart nohz full tick from irq exit. A simplification and a preparation for future optimization on scheduler kick to nohz full. - Simple code cleanups. - Tile driver isolation enhancement on top of nohz. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 78b4bad10..4d34035 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2489,7 +2489,7 @@ static struct rq *finish_task_switch(struct task_struct *prev)
put_task_struct(prev);
}
- tick_nohz_task_switch(current);
+ tick_nohz_task_switch();
return rq;
}
OpenPOWER on IntegriCloud