mm: introduce CONFIG_MEMCG_KMEM as combination of CONFIG_MEMCG && !CONFIG_SLOB

[linux-block.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 95a5018c338ea6a8b2f84bc32e1ee48fd29da2fe..789923fbee3a8a8dc849c92a08ce37893e175b31 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -722,8 +722,8 @@ struct task_struct {
        unsigned                        restore_sigmask:1;
 #endif
 #ifdef CONFIG_MEMCG
-       unsigned                        memcg_may_oom:1;
-#ifndef CONFIG_SLOB
+       unsigned                        in_user_fault:1;
+#ifdef CONFIG_MEMCG_KMEM
        unsigned                        memcg_kmem_skip_account:1;
 #endif
 #endif
@@ -1152,6 +1152,9 @@ struct task_struct {
 
        /* Number of pages to reclaim on returning to userland: */
        unsigned int                    memcg_nr_pages_over_high;
+
+       /* Used by memcontrol for targeted memcg charge: */
+       struct mem_cgroup               *active_memcg;
 #endif
 
 #ifdef CONFIG_BLK_CGROUP