diff options
| author | Nico Pache <npache@redhat.com> | 2026-05-26 05:40:03 -0600 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2026-05-28 21:31:33 -0700 |
| commit | defe6e949b888028363abf2b452e2a07bb0b9031 (patch) | |
| tree | 82f72c2bcdcd181c675f3008dd9fa00e6217ad93 /mm | |
| parent | 5f2f3b76b10f8d62bd1932b6f4755d3417519ffd (diff) | |
| download | linux-next-history-defe6e949b888028363abf2b452e2a07bb0b9031.tar.gz | |
cleanup collapse_max_ptes_none
make max_ptes_none a const and cleanup the pr_warn_once
Link: https://lore.kernel.org/b5fa19c5-4b3e-40b8-8e78-fc31169a7a79@redhat.com
Signed-off-by: Nico Pache <npache@redhat.com>
Acked-by: David Hildenbrand (arm) <david@kernel.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: "Liam R. Howlett" <liam@infradead.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/khugepaged.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 702e1d47da859..6b442f760ce1e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -360,7 +360,7 @@ static bool pte_none_or_zero(pte_t pte) static unsigned int collapse_max_ptes_none(struct collapse_control *cc, struct vm_area_struct *vma, unsigned int order) { - unsigned int max_ptes_none = khugepaged_max_ptes_none; + const unsigned int max_ptes_none = khugepaged_max_ptes_none; if (vma && userfaultfd_armed(vma)) return 0; @@ -376,14 +376,13 @@ static unsigned int collapse_max_ptes_none(struct collapse_control *cc, */ if (max_ptes_none == KHUGEPAGED_MAX_PTES_LIMIT) return (1 << order) - 1; - if (!max_ptes_none) - return 0; /* * For mTHP collapse of values other than 0 or KHUGEPAGED_MAX_PTES_LIMIT, * emit a warning and return 0. */ - pr_warn_once("mTHP collapse does not support max_ptes_none values" - " other than 0 or %u, defaulting to 0.\n", + if (max_ptes_none) + pr_warn_once("mTHP collapse does not support max_ptes_none" + " values other than 0 or %u, defaulting to 0.\n", KHUGEPAGED_MAX_PTES_LIMIT); return 0; } |