diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-02-09 18:18:01 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-02-13 00:35:00 +0100 |
| commit | 3c25a8b5718ca866c5984e0492c5070503bb3aa6 (patch) | |
| tree | fb9f3680952f39933f3923978189cb3963c40b38 | |
| parent | bde44b6f6e1cb4eef34ef1f81125925e2ac3f244 (diff) | |
| download | rt-linux-3c25a8b5718ca866c5984e0492c5070503bb3aa6.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>
| -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 83a64d4a80e53e..62547aabb929b7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3078,7 +3078,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 @@ -3105,7 +3105,7 @@ void migrate_enable(void) { struct task_struct *p = current; - if (in_atomic()) { + if (in_atomic() || irqs_disabled()) { #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic--; #endif |