diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-05-30 15:54:15 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-05-30 15:54:15 +1000 |
| commit | 2a1720376adda5ecf8e636fbfb05339c7dad1c55 (patch) | |
| tree | cdb76abac82306516aa556d9e9ddb15571f07517 /kernel/sched/idle.c | |
| parent | a82256bc026722800d1fdeca5521f1ba487bc2ef (diff) | |
| parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
Backmerge tag 'v4.12-rc3' into drm-next
Linux 4.12-rc3
Daniel has requested this for some drm-intel-next work.
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); |