From b2694e3cc2c7d6958898ee6ccddf8bab92820398 Mon Sep 17 00:00:00 2001 From: lk_huawei Date: Sat, 24 Sep 2022 08:38:40 +0000 Subject: [PATCH] mm: Fix some warning in mm ohos inclusion category: bugfix issue: #I5SXYX CVE: NA -------------------------------- Fix some warning in mm, such as unused variable and function. Signed-off-by: lk_huawei --- mm/lmkd_dbg_trigger.c | 10 ---------- mm/memcg_reclaim.c | 3 +-- mm/purgeable.c | 1 - mm/workingset.c | 10 ++-------- mm/zswapd.c | 1 - 5 files changed, 3 insertions(+), 22 deletions(-) diff --git a/mm/lmkd_dbg_trigger.c b/mm/lmkd_dbg_trigger.c index e845b14f5f02..bd97331e0e5a 100644 --- a/mm/lmkd_dbg_trigger.c +++ b/mm/lmkd_dbg_trigger.c @@ -19,16 +19,6 @@ static int lmkd_oom_score_adj; static atomic64_t lmkd_no_cma_cnt = ATOMIC64_INIT(0); -void lmkd_inc_no_cma_cnt(void) -{ - atomic64_inc(&lmkd_no_cma_cnt); -} - -void lmkd_dec_no_cma_cnt(void) -{ - atomic64_dec(&lmkd_no_cma_cnt); -} - static int lmkd_dbg_trigger_proc_show(struct seq_file *m, void *v) { seq_printf(m, "lmkd_oom_score_adj: %d\n", lmkd_oom_score_adj); diff --git a/mm/memcg_reclaim.c b/mm/memcg_reclaim.c index 9f879a385b4d..7408731e5b45 100644 --- a/mm/memcg_reclaim.c +++ b/mm/memcg_reclaim.c @@ -340,7 +340,7 @@ static void shrink_file(struct pglist_data *pgdat, bool shrink_node_hyperhold(struct pglist_data *pgdat, struct scan_control *sc) { - unsigned long nr_reclaimed, nr_scanned; + unsigned long nr_reclaimed; struct lruvec *target_lruvec; bool reclaimable = false; unsigned long file; @@ -353,7 +353,6 @@ bool shrink_node_hyperhold(struct pglist_data *pgdat, struct scan_control *sc) memset(&sc->nr, 0, sizeof(sc->nr)); nr_reclaimed = sc->nr_reclaimed; - nr_scanned = sc->nr_scanned; /* * Determine the scan balance between anon and file LRUs. diff --git a/mm/purgeable.c b/mm/purgeable.c index a4c71cf72c69..28c20b4b4a02 100644 --- a/mm/purgeable.c +++ b/mm/purgeable.c @@ -221,7 +221,6 @@ void uxpte_clear_present(struct vm_area_struct *vma, unsigned long addr) goto unlock; if (!uxpte_cas(uxpte, val, val - 1)) goto retry; - val--; unlock: spin_unlock(&vma->vm_mm->uxpgd_lock); } diff --git a/mm/workingset.c b/mm/workingset.c index 28d9bf0c5e5d..b0f966f71cee 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -323,9 +323,7 @@ void workingset_refault(struct page *page, void *shadow) * configurations instead. */ #ifdef CONFIG_HYPERHOLD_FILE_LRU - if (memcgid == -1) - eviction_lruvec = node_lruvec(pgdat); - else { + if (memcgid != -1) { eviction_memcg = mem_cgroup_from_id(memcgid); if (!mem_cgroup_disabled() && !eviction_memcg) goto out; @@ -551,11 +549,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, * PAGE_SIZE / xa_nodes / node_entries * 8 / PAGE_SIZE */ #ifdef CONFIG_MEMCG -#ifdef CONFIG_HYPERHOLD_FILE_LRU - pages = node_page_state(NODE_DATA(sc->nid), NR_ACTIVE_FILE) + - node_page_state(NODE_DATA(sc->nid), NR_INACTIVE_FILE); -#else - +#ifndef CONFIG_HYPERHOLD_FILE_LRU if (sc->memcg) { struct lruvec *lruvec; int i; diff --git a/mm/zswapd.c b/mm/zswapd.c index 0eea65a4bb7f..12b8a8630a3d 100644 --- a/mm/zswapd.c +++ b/mm/zswapd.c @@ -184,7 +184,6 @@ static unsigned int calc_sys_cur_avail_buffers(void) freemem = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE / SZ_1K; active_file = global_node_page_state(NR_ACTIVE_FILE) * PAGE_SIZE / SZ_1K; inactive_file = global_node_page_state(NR_INACTIVE_FILE) * PAGE_SIZE / SZ_1K; - inactive_anon = global_node_page_state(NR_INACTIVE_ANON) * PAGE_SIZE / SZ_1K; buffers = freemem + inactive_file * get_inactive_file_ratio() / percent_constant + active_file * get_active_file_ratio() / percent_constant; -- Gitee