Since commit 857f21397f71 ("memcg, oom: remove unnecessary check in
mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order
are no longer used any more.
Signed-off-by: Xiu Jianfeng <xiujianfeng@xxxxxxxxxx>
---
include/linux/sched.h | 2 --
mm/memcontrol.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8d1cf672ac4c..61591ac6eab6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1449,8 +1449,6 @@ struct task_struct {
#ifdef CONFIG_MEMCG
struct mem_cgroup *memcg_in_oom;
- gfp_t memcg_oom_gfp_mask;
- int memcg_oom_order;
/* Number of pages to reclaim on returning to userland: */
unsigned int memcg_nr_pages_over_high;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 5d4da23264fa..d127c9c5fabf 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2192,8 +2192,6 @@ static bool mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
if (current->in_user_fault) {
css_get(&memcg->css);
current->memcg_in_oom = memcg;
- current->memcg_oom_gfp_mask = mask;
- current->memcg_oom_order = order;
}
return false;
}
--
2.34.1
