Merge 4.14.15 into android-4.14

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index bd617bfeef8fcaacf3d4e71c472ac43067635d88..15d9be654a55cc3a2301d7b2092d446f4a3b8d30 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2082,7 +2082,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags,
        p->state = TASK_WAKING;
 
        if (p->in_iowait) {
-               delayacct_blkio_end();
+               delayacct_blkio_end(p);
                atomic_dec(&task_rq(p)->nr_iowait);
        }
 
@@ -2096,7 +2096,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags,
 #else /* CONFIG_SMP */
 
        if (p->in_iowait) {
-               delayacct_blkio_end();
+               delayacct_blkio_end(p);
                atomic_dec(&task_rq(p)->nr_iowait);
        }
 
@@ -2154,7 +2154,7 @@ static void try_to_wake_up_local(struct task_struct *p, struct rq_flags *rf)
                walt_update_task_ravg(p, rq, TASK_WAKE, wallclock, 0);
 
                if (p->in_iowait) {
-                       delayacct_blkio_end();
+                       delayacct_blkio_end(p);
                        atomic_dec(&rq->nr_iowait);
                }
                ttwu_activate(rq, p, ENQUEUE_WAKEUP | ENQUEUE_NOCLOCK);