From 4f30bc370b4c0d32571cd55206592ec180a6d122 Mon Sep 17 00:00:00 2001 From: Ke Liu Date: Tue, 28 Mar 2023 17:33:18 +0800 Subject: [PATCH] mm: fix error in zswapd for 32bit compile ohos inclusion category: bugfix issue: #I6R44G CVE: NA -------------------------------- Fix error for 32bit clang compile. Following the error message. mm/zswapd.o: In function `zswapd': zswapd.c:(.text+0x2464): undefined reference to `__aeabi_uldivmod' Signed-off-by: Ke Liu --- mm/zswapd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/zswapd.c b/mm/zswapd.c index 65d0c102c808..89383ab58c6a 100644 --- a/mm/zswapd.c +++ b/mm/zswapd.c @@ -87,8 +87,8 @@ u64 swapin_memcg(struct mem_cgroup *memcg, u64 req_size) u64 ratio = atomic64_read(&memcg->memcg_reclaimed.ub_ufs2zram_ratio); struct group_swap_device *gsdev = NULL; - if (req_size > swap_size * ratio / ESWAP_PERCENT_CONSTANT) - req_size = swap_size * ratio / ESWAP_PERCENT_CONSTANT; + if (req_size > div_u64(swap_size * ratio, ESWAP_PERCENT_CONSTANT)) + req_size = div_u64(swap_size * ratio, ESWAP_PERCENT_CONSTANT); down_read(&gs_lock); list_for_each_entry(gsdev, &gs_list, list) { read_size += gsdev->ops->group_read(memcg->id.id, req_size - read_size, @@ -110,10 +110,10 @@ static u64 swapout_memcg(struct mem_cgroup *memcg, u64 req_size) u32 ratio = atomic_read(&memcg->memcg_reclaimed.ub_zram2ufs_ratio); struct group_swap_device *gsdev = NULL; - if (all_size * ratio / ESWAP_PERCENT_CONSTANT <= swap_size) + if (div_u64(all_size * ratio, ESWAP_PERCENT_CONSTANT) <= swap_size) return 0; - if (req_size > all_size * ratio / ESWAP_PERCENT_CONSTANT - swap_size) - req_size = all_size * ratio / ESWAP_PERCENT_CONSTANT - swap_size; + if (req_size > div_u64(all_size * ratio, ESWAP_PERCENT_CONSTANT) - swap_size) + req_size = div_u64(all_size * ratio, ESWAP_PERCENT_CONSTANT) - swap_size; down_read(&gs_lock); list_for_each_entry(gsdev, &gs_list, list) { write_size += gsdev->ops->group_write(memcg->id.id, req_size - write_size, -- Gitee