diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-02-09 18:18:01 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-11-16 14:23:17 -0500 |
| commit | 834cd01b4d8c3ace26c9dfa9cc556d4f7fd59f2e (patch) | |
| tree | 25f00b127354cec5e100a61255ee1a0bc7790a40 | |
| parent | 0b6bc2572f572751c55ea724ac6b41a615258bec (diff) | |
| download | linux-rt-834cd01b4d8c3ace26c9dfa9cc556d4f7fd59f2e.tar.gz | |
kernel: migrate_disable() do fastpath in atomic & irqs-off
With interrupts off it makes no sense to do the long path since we can't
leave the CPU anyway. Also we might end up in a recursion with lockdep.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e0d773e33475..9c9ff71587ea 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3389,7 +3389,7 @@ void migrate_disable(void) { struct task_struct *p = current; - if (in_atomic()) { + if (in_atomic() || irqs_disabled()) { #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic++; #endif @@ -3420,7 +3420,7 @@ void migrate_enable(void) unsigned long flags; struct rq *rq; - if (in_atomic()) { + if (in_atomic() || irqs_disabled()) { #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic--; #endif |