From: Wang Wensheng <wangwensheng4@huawei.com> hulk inclusion category: feature category: bugfix bugzilla: NA --------------------------------------------- Prepare for later patch and no logic change here. Fixes: 00c7c3d64806 ("hugetlb: support auto demote and promote") Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com> --- mm/share_pool.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mm/share_pool.c b/mm/share_pool.c index e2369747c983..100446279620 100644 --- a/mm/share_pool.c +++ b/mm/share_pool.c @@ -2176,7 +2176,8 @@ static int sp_map_spa_to_mm(struct mm_struct *mm, struct sp_area *spa, return (int)mmap_addr; } - if (spa->type == SPA_TYPE_ALLOC) { + switch (spa->type) { + case SPA_TYPE_ALLOC: mmap_write_unlock(mm); ret = sp_alloc_populate(mm, spa, populate, ac); if (ret) { @@ -2184,13 +2185,18 @@ static int sp_map_spa_to_mm(struct mm_struct *mm, struct sp_area *spa, do_munmap(mm, mmap_addr, spa_size(spa), NULL); mmap_write_unlock(mm); } - } else { + break; + case SPA_TYPE_K2SPG: + case SPA_TYPE_K2TASK: ret = sp_k2u_populate(mm, spa); if (ret) { do_munmap(mm, mmap_addr, spa_size(spa), NULL); pr_info("k2u populate failed, %d\n", ret); } mmap_write_unlock(mm); + break; + default: + break; } #ifdef CONFIG_ASCEND_PAGE_TABLE_MULTI_VIEW -- 2.43.0