Skip to contentSkip to conversation

selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 21

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests/mm: hugepage_settings: use unsigned long in detect_hugetlb_page_size
has been removed from the -mm tree. Its filename was
selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: selftests/mm: hugepage_settings: use unsigned long in detect_hugetlb_page_size
Date: Mon, 11 May 2026 19:28:09 +0300

... instead of size_t to avoid type mismatch in 32 and 64 bit builds.

Cc Baolin Wang <[email protected]>
Cc Barry Song <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Dev Jain <[email protected]>
Cc Donet Tom <[email protected]>
Cc Jason Gunthorpe <[email protected]>
Cc John Hubbard <[email protected]>
Cc Lance Yang <[email protected]>
Cc Leon Romanovsky <[email protected]>
Cc Liam Howlett <[email protected]>
Cc Li Wang <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Mark Brown <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Nico Pache <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Shuah Khan <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Zi Yan <[email protected]>

---

 tools/testing/selftests/mm/cow.c               |    2 +-
 tools/testing/selftests/mm/gup_longterm.c      |    2 +-
 tools/testing/selftests/mm/hugepage_settings.c |    2 +-
 tools/testing/selftests/mm/hugepage_settings.h |    2 +-
 tools/testing/selftests/mm/uffd-wp-mremap.c    |    6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)
tools/testing/selftests/mm/cow.c renamed from tools/testing/selftests/mm/cow.c~selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size +1 -1
@@ -37,7 +37,7 @@ static size_t pmdsize;
 static int nr_thpsizes;
 static size_t thpsizes[20];
 static int nr_hugetlbsizes;
-static size_t hugetlbsizes[10];
+static unsigned long hugetlbsizes[10];
 static int gup_fd;
 static bool has_huge_zeropage;
 
tools/testing/selftests/mm/gup_longterm.c renamed from tools/testing/selftests/mm/gup_longterm.c~selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size +1 -1
@@ -33,7 +33,7 @@
 
 static size_t pagesize;
 static int nr_hugetlbsizes;
-static size_t hugetlbsizes[10];
+static unsigned long hugetlbsizes[10];
 static int gup_fd;
 
 static __fsword_t get_fs_type(int fd)
tools/testing/selftests/mm/hugepage_settings.c renamed from tools/testing/selftests/mm/hugepage_settings.c~selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size +1 -1
@@ -398,7 +398,7 @@ bool thp_is_enabled(void)
 	return mode == 1 || mode == 3;
 }
 
-int detect_hugetlb_page_sizes(size_t sizes[], int max)
+int detect_hugetlb_page_sizes(unsigned long sizes[], int max)
 {
 	DIR *dir = opendir("/sys/kernel/mm/hugepages/");
 	int count = 0;
tools/testing/selftests/mm/hugepage_settings.h renamed from tools/testing/selftests/mm/hugepage_settings.h~selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size +1 -1
@@ -90,7 +90,7 @@ bool thp_is_enabled(void);
 
 /* HugeTLB */
 
-int detect_hugetlb_page_sizes(size_t sizes[], int max);
+int detect_hugetlb_page_sizes(unsigned long sizes[], int max);
 unsigned long default_huge_page_size(void);
 unsigned long get_free_hugepages(void);
 
tools/testing/selftests/mm/uffd-wp-mremap.c renamed from tools/testing/selftests/mm/uffd-wp-mremap.c~selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size +3 -3
@@ -12,12 +12,12 @@
 #include "uffd-common.h"
 
 static int pagemap_fd;
-static size_t pagesize;
 static int nr_pagesizes = 1;
+static unsigned long pagesize;
 static int nr_thpsizes;
 static size_t thpsizes[20];
 static int nr_hugetlbsizes;
-static size_t hugetlbsizes[10];
+static unsigned long hugetlbsizes[10];
 
 static int detect_thp_sizes(size_t sizes[], int max)
 {
@@ -245,7 +245,7 @@ out:
 }
 
 struct testcase {
-	size_t *sizes;
+	unsigned long *sizes;
 	int *nr_sizes;
 	bool private;
 	bool swapout;

_

Patches currently in -mm which might be from [email protected] are