Skip to content

Commit 76edc53

Browse files
Xiu Jianfengakpm00
authored andcommitted
memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order
Since commit 857f213 ("memcg, oom: remove unnecessary check in mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order are no longer used any more. Link: https://lkml.kernel.org/r/20240509032628.1217652-1-xiujianfeng@huawei.com Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Shakeel Butt <shakeel.butt@linux.dev> Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Muchun Song <songmuchun@bytedance.com> Cc: Benjamin Segall <bsegall@google.com> Cc: Daniel Bristot de Oliveira <bristot@redhat.com> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Juri Lelli <juri.lelli@redhat.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt (Google) <rostedt@goodmis.org> Cc: Valentin Schneider <vschneid@redhat.com> Cc: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent b665eed commit 76edc53

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

include/linux/sched.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,8 +1448,6 @@ struct task_struct {
14481448

14491449
#ifdef CONFIG_MEMCG
14501450
struct mem_cgroup *memcg_in_oom;
1451-
gfp_t memcg_oom_gfp_mask;
1452-
int memcg_oom_order;
14531451

14541452
/* Number of pages to reclaim on returning to userland: */
14551453
unsigned int memcg_nr_pages_over_high;

mm/memcontrol.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,8 +2188,6 @@ static bool mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
21882188
if (current->in_user_fault) {
21892189
css_get(&memcg->css);
21902190
current->memcg_in_oom = memcg;
2191-
current->memcg_oom_gfp_mask = mask;
2192-
current->memcg_oom_order = order;
21932191
}
21942192
return false;
21952193
}

0 commit comments

Comments
 (0)