The patch titled
Subject: mm-hugetlb-convert-free_huge_page-to-folios-fix
has been added to the -mm mm-unstable branch. Its filename is
mm-hugetlb-convert-free_huge_page-to-folios-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-hugetlb-convert-free_huge_page-to-folios-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-hugetlb-convert-free_huge_page-to-folios-fix
Date: Mon Oct 17 01:32:30 PM PDT 2022
fix build
In file included from ./include/linux/mm.h:6,
from mm/hugetlb.c:8:
mm/hugetlb.c: In function 'free_huge_page':
mm/hugetlb.c:1707:47: error: passing argument 1 of 'dump_page' from incompatible pointer type [-Werror=incompatible-pointer-types]
1707 | VM_BUG_ON_PAGE(folio_mapcount(folio), folio);
| ^~~~~
| |
| struct folio *
./include/linux/mmdebug.h:21:35: note: in definition of macro 'VM_BUG_ON_PAGE'
21 | dump_page(page, "VM_BUG_ON_PAGE(" __stringify(cond)")");\
| ^~~~
./include/linux/mmdebug.h:12:29: note: expected 'struct page *' but argument is of type 'struct folio *'
12 | void dump_page(struct page *page, const char *reason);
| ~~~~~~~~~~~~~^~~~
cc1: all warnings being treated as errors
make[2]: *** [scripts/Makefile.build:250: mm/hugetlb.o] Error 1
make[1]: *** [scripts/Makefile.build:500: mm] Error 2
make: *** [Makefile:1992: .] Error 2
Cc: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/hugetlb.c~mm-hugetlb-convert-free_huge_page-to-folios-fix
+++ a/mm/hugetlb.c
@@ -1704,7 +1704,7 @@ void free_huge_page(struct page *page)
unsigned long flags;
VM_BUG_ON_FOLIO(folio_ref_count(folio), folio);
- VM_BUG_ON_PAGE(folio_mapcount(folio), folio);
+ VM_BUG_ON_FOLIO(folio_mapcount(folio), folio);
hugetlb_set_folio_subpool(folio, NULL);
if (folio_test_anon(folio))
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-hugetlb-convert-free_huge_page-to-folios-fix.patch
