From dc178bd37649c326a4e3c7e4a74e1fb49b5301b0 Mon Sep 17 00:00:00 2001 From: Malachite Date: Fri, 11 Jul 2025 16:28:38 +0800 Subject: [PATCH] fixed mm/memcontrol.c compilation failure when NUMA disabled and MEMCG enabled --- mm/memcontrol.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c0d3b56a1ab4..6238e0322d5d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4826,46 +4826,46 @@ static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css, } #endif -#ifdef CONFIG_NUMA - -#define LRU_ALL_FILE (BIT(LRU_INACTIVE_FILE) | BIT(LRU_ACTIVE_FILE)) -#define LRU_ALL_ANON (BIT(LRU_INACTIVE_ANON) | BIT(LRU_ACTIVE_ANON)) -#define LRU_ALL ((1 << NR_LRU_LISTS) - 1) - -static unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, - int nid, unsigned int lru_mask, bool tree) +static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, + unsigned int lru_mask, + bool tree) { - struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); unsigned long nr = 0; enum lru_list lru; - VM_BUG_ON((unsigned)nid >= nr_node_ids); - for_each_lru(lru) { if (!(BIT(lru) & lru_mask)) continue; if (tree) - nr += lruvec_page_state(lruvec, NR_LRU_BASE + lru); + nr += memcg_page_state(memcg, NR_LRU_BASE + lru); else - nr += lruvec_page_state_local(lruvec, NR_LRU_BASE + lru); + nr += memcg_page_state_local(memcg, NR_LRU_BASE + lru); } return nr; } -static unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, - unsigned int lru_mask, - bool tree) +#ifdef CONFIG_NUMA + +#define LRU_ALL_FILE (BIT(LRU_INACTIVE_FILE) | BIT(LRU_ACTIVE_FILE)) +#define LRU_ALL_ANON (BIT(LRU_INACTIVE_ANON) | BIT(LRU_ACTIVE_ANON)) +#define LRU_ALL ((1 << NR_LRU_LISTS) - 1) + +static unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, + int nid, unsigned int lru_mask, bool tree) { + struct lruvec *lruvec = mem_cgroup_lruvec(memcg, NODE_DATA(nid)); unsigned long nr = 0; enum lru_list lru; + VM_BUG_ON((unsigned)nid >= nr_node_ids); + for_each_lru(lru) { if (!(BIT(lru) & lru_mask)) continue; if (tree) - nr += memcg_page_state(memcg, NR_LRU_BASE + lru); + nr += lruvec_page_state(lruvec, NR_LRU_BASE + lru); else - nr += memcg_page_state_local(memcg, NR_LRU_BASE + lru); + nr += lruvec_page_state_local(lruvec, NR_LRU_BASE + lru); } return nr; } -- Gitee