diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-04-11 13:26:27 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-04-11 13:26:27 -0700 |
| commit | eb6f51782cd131f90ca093d1d0756581886970d4 (patch) | |
| tree | 1b6247df3bd8f55fb13532ee730f0ce744ae839d | |
| parent | a8264371b2e033aed0ecb0cc5bb51a684af08eef (diff) | |
| download | 25-new-eb6f51782cd131f90ca093d1d0756581886970d4.tar.gz | |
foo
| -rw-r--r-- | patches/mm-add-per-order-mthp-swpin_refault-counter-fix.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/mm-add-per-order-mthp-swpin_refault-counter-fix.patch b/patches/mm-add-per-order-mthp-swpin_refault-counter-fix.patch new file mode 100644 index 000000000..c07c1c67e --- /dev/null +++ b/patches/mm-add-per-order-mthp-swpin_refault-counter-fix.patch @@ -0,0 +1,34 @@ +From: Barry Song <21cnbao@gmail.com> +Subject: mm-add-per-order-mthp-swpin_refault-counter-fix +Date: Thu, 11 Apr 2024 13:46:36 +1200 + +fix build errors on CONFIG_TRANSPARENT_HUGEPAGE=N + +Link: https://lkml.kernel.org/r/20240411014636.14023-1-21cnbao@gmail.com +Signed-off-by: Barry Song <v-songbaohua@oppo.com> +Reported-by: SeongJae Park <sj@kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + + mm/memory.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/mm/memory.c~mm-add-per-order-mthp-swpin_refault-counter-fix ++++ a/mm/memory.c +@@ -4141,6 +4141,7 @@ vm_fault_t do_swap_page(struct vm_fault + vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, + &vmf->ptl); + ++#ifdef CONFIG_TRANSPARENT_HUGEPAGE + /* We hit large folios in swapcache */ + if (start_pte && folio_test_large(folio) && folio_test_swapcache(folio)) { + int nr = folio_nr_pages(folio); +@@ -4170,6 +4171,7 @@ vm_fault_t do_swap_page(struct vm_fault + } + + check_pte: ++#endif + if (unlikely(!vmf->pte || !pte_same(ptep_get(vmf->pte), vmf->orig_pte))) + goto out_nomap; + +_ |