Merge branch 'linux-3.10.61' into dev-kernel-3.10
[linux-3.10.git] / include / linux / sched.h
index 6b1b2f3..653dbe0 100644 (file)
@@ -1430,10 +1430,9 @@ struct task_struct {
        unsigned int memcg_kmem_skip_account;
        struct memcg_oom_info {
                unsigned int may_oom:1;
-               unsigned int in_memcg_oom:1;
-               unsigned int oom_locked:1;
-               int wakeups;
-               struct mem_cgroup *wait_on_memcg;
+               struct mem_cgroup *memcg;
+               gfp_t gfp_mask;
+               int order;
        } memcg_oom;
 #endif
 #ifdef CONFIG_HAVE_HW_BREAKPOINT