Merge tag 'v4.18-rc6' into for-4.19/block2

[linux-2.6-microblaze.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index a191c05..f40c82b 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -868,6 +868,11 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
        tsk->fail_nth = 0;
 #endif
 
+#ifdef CONFIG_BLK_CGROUP
+       tsk->throttle_queue = NULL;
+       tsk->use_memdelay = 0;
+#endif
+
        return tsk;
 
 free_stack: