From 2888729a254924b173c68efbbc06c2054b01f687 Mon Sep 17 00:00:00 2001 From: lk_hauwei Date: Wed, 2 Nov 2022 15:14:56 +0800 Subject: [PATCH] mm: fix error function name for hyperhold and fix warning ohos inclusion category: bugfix issue: #I5YZYH CVE: NA -------------------------------- Fix error function name in zlist.h which is different in zlist.c and fix some warning in mm. Signed-off-by: lk_huawei --- drivers/block/zram/zram_group/zlist.h | 2 +- mm/mmap.c | 4 ++-- mm/zswapd.c | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/block/zram/zram_group/zlist.h b/drivers/block/zram/zram_group/zlist.h index 430b079bcd49..9509e3b674ca 100644 --- a/drivers/block/zram/zram_group/zlist.h +++ b/drivers/block/zram/zram_group/zlist.h @@ -82,7 +82,7 @@ static inline bool zlist_del(u32 hid, u32 idx, struct zlist_table *tab) return ret; } -bool zlist_get_priv(u32 idx, struct zlist_table *tab); +bool zlist_set_priv(u32 idx, struct zlist_table *tab); bool zlist_clr_priv(u32 idx, struct zlist_table *tab); void zlist_node_init(u32 idx, struct zlist_table *tab); diff --git a/mm/mmap.c b/mm/mmap.c index 787116f8d481..0913195ee67d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1579,11 +1579,11 @@ unsigned long do_mmap(struct file *file, unsigned long addr, #ifdef CONFIG_MEM_PURGEABLE case MAP_PURGEABLE: vm_flags |= VM_PURGEABLE; - pr_info("vm_flags purgeable = %lx.\m", VM_PURGEABLE); + pr_info("vm_flags purgeable = %lx.\n", VM_PURGEABLE); break; case MAP_USEREXPTE: vm_flags |= VM_USEREXPTE; - pr_info("vm_flags useredpte = %lx.\m", VM_USEREXPTE); + pr_info("vm_flags useredpte = %lx.\n", VM_USEREXPTE); break; #endif default: diff --git a/mm/zswapd.c b/mm/zswapd.c index 12b8a8630a3d..898ef69e2c5b 100644 --- a/mm/zswapd.c +++ b/mm/zswapd.c @@ -178,7 +178,6 @@ static unsigned int calc_sys_cur_avail_buffers(void) unsigned long freemem; unsigned long active_file; unsigned long inactive_file; - unsigned long inactive_anon; unsigned long buffers; freemem = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE / SZ_1K; -- Gitee