diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-23 05:32:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-23 05:32:48 +0200 |
| commit | 218b6a5b23e939caf2064549b1cb61ba22b9d0a1 (patch) | |
| tree | bdabf5439fb58905268953165779614d2aadb677 /kernel/sched/idle.c | |
| parent | Merge branch 'dsa-distribute-switch-events' (diff) | |
| parent | Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.xz linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/sched/idle.c')
| -rw-r--r-- | kernel/sched/idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 2a25a9ec2c6e..ef63adce0c9c 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -265,7 +265,7 @@ static void do_idle(void) smp_mb__after_atomic(); sched_ttwu_pending(); - schedule_preempt_disabled(); + schedule_idle(); if (unlikely(klp_patch_pending(current))) klp_update_patch_state(current); |