Merge tag 'for-4.19/block-20180812' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index dac5086..95a5018 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -734,6 +734,10 @@ struct task_struct {
        /* disallow userland-initiated cgroup migration */
        unsigned                        no_cgroup_migration:1;
 #endif
+#ifdef CONFIG_BLK_CGROUP
+       /* to be used once the psi infrastructure lands upstream. */
+       unsigned                        use_memdelay:1;
+#endif
 
        unsigned long                   atomic_flags; /* Flags requiring atomic access. */
 
@@ -1150,6 +1154,10 @@ struct task_struct {
        unsigned int                    memcg_nr_pages_over_high;
 #endif
 
+#ifdef CONFIG_BLK_CGROUP
+       struct request_queue            *throttle_queue;
+#endif
+
 #ifdef CONFIG_UPROBES
        struct uprobe_task              *utask;
 #endif