Merge tag 'v3.10.61' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 1e287bacafc70577ddb702908389862c90337b49..6ca9630fde2d4d5eaac3118fa6544fd0616d44e3 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1432,6 +1432,12 @@ struct task_struct {
                unsigned long memsw_nr_pages; /* uncharged mem+swap usage */
        } memcg_batch;
        unsigned int memcg_kmem_skip_account;
+       struct memcg_oom_info {
+               struct mem_cgroup *memcg;
+               gfp_t gfp_mask;
+               int order;
+               unsigned int may_oom:1;
+       } memcg_oom;
 #endif
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
        atomic_t ptrace_bp_refcnt;