Skip to contentSkip to conversation

selftests-mm-rename-thp_settings-to-hugepage_settings.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: rename thp_settings.[ch] to hugepage_settings.[ch]
has been removed from the -mm tree. Its filename was
selftests-mm-rename-thp_settings-to-hugepage_settings.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: rename thp_settings.[ch] to hugepage_settings.[ch]
Date: Mon, 11 May 2026 19:28:07 +0300

... for upcoming addition of HugeTLB helpers.

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/Makefile                |    4 
 tools/testing/selftests/mm/cow.c                   |    2 
 tools/testing/selftests/mm/folio_split_race_test.c |    2 
 tools/testing/selftests/mm/guard-regions.c         |    2 
 tools/testing/selftests/mm/hugepage_settings.c     |  397 +++++++++++
 tools/testing/selftests/mm/hugepage_settings.h     |   89 ++
 tools/testing/selftests/mm/khugepaged.c            |    2 
 tools/testing/selftests/mm/ksm_tests.c             |    2 
 tools/testing/selftests/mm/migration.c             |    2 
 tools/testing/selftests/mm/prctl_thp_disable.c     |    2 
 tools/testing/selftests/mm/soft-dirty.c            |    2 
 tools/testing/selftests/mm/split_huge_page_test.c  |    2 
 tools/testing/selftests/mm/thp_settings.c          |  397 -----------
 tools/testing/selftests/mm/thp_settings.h          |   89 --
 tools/testing/selftests/mm/transhuge-stress.c      |    2 
 tools/testing/selftests/mm/uffd-wp-mremap.c        |    2 
 16 files changed, 499 insertions(+), 499 deletions(-)
tools/testing/selftests/mm/cow.c renamed from tools/testing/selftests/mm/cow.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -29,7 +29,7 @@
 #include "../../../../mm/gup_test.h"
 #include "kselftest.h"
 #include "vm_util.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 static size_t pagesize;
 static int pagemap_fd;
tools/testing/selftests/mm/folio_split_race_test.c renamed from tools/testing/selftests/mm/folio_split_race_test.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "vm_util.h"
 #include "kselftest.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 uint64_t page_size;
 uint64_t pmd_pagesize;
tools/testing/selftests/mm/guard-regions.c renamed from tools/testing/selftests/mm/guard-regions.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -21,7 +21,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 #include "vm_util.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 #include "../pidfd/pidfd.h"
 
tools/testing/selftests/mm/hugepage_settings.c new file +397 -0

397 lines not on this page · raw message

tools/testing/selftests/mm/hugepage_settings.h new file +89 -0

89 lines not on this page · raw message

tools/testing/selftests/mm/khugepaged.c renamed from tools/testing/selftests/mm/khugepaged.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -22,7 +22,7 @@
 #include "linux/magic.h"
 
 #include "vm_util.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 #define BASE_ADDR ((void *)(1UL << 30))
 static unsigned long hpage_pmd_size;
tools/testing/selftests/mm/ksm_tests.c renamed from tools/testing/selftests/mm/ksm_tests.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -15,7 +15,7 @@
 #include "kselftest.h"
 #include <include/vdso/time64.h>
 #include "vm_util.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/"
 #define KSM_FP(s) (KSM_SYSFS_PATH s)
tools/testing/selftests/mm/Makefile renamed from tools/testing/selftests/mm/Makefile~selftests-mm-rename-thp_settings-to-hugepage_settings +2 -2
@@ -187,8 +187,8 @@ TEST_FILES += write_hugetlb_memory.sh
 
 include ../lib.mk
 
-$(TEST_GEN_PROGS): vm_util.c thp_settings.c
-$(TEST_GEN_FILES): vm_util.c thp_settings.c
+$(TEST_GEN_PROGS): vm_util.c hugepage_settings.c
+$(TEST_GEN_FILES): vm_util.c hugepage_settings.c
 
 $(OUTPUT)/uffd-stress: uffd-common.c
 $(OUTPUT)/uffd-unit-tests: uffd-common.c
tools/testing/selftests/mm/migration.c renamed from tools/testing/selftests/mm/migration.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -5,7 +5,7 @@
  */
 
 #include "kselftest_harness.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 #include <strings.h>
 #include <pthread.h>
tools/testing/selftests/mm/prctl_thp_disable.c renamed from tools/testing/selftests/mm/prctl_thp_disable.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -14,7 +14,7 @@
 #include <sys/wait.h>
 
 #include "kselftest_harness.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 #include "vm_util.h"
 
 #ifndef PR_THP_DISABLE_EXCEPT_ADVISED
tools/testing/selftests/mm/soft-dirty.c renamed from tools/testing/selftests/mm/soft-dirty.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -9,7 +9,7 @@
 
 #include "kselftest.h"
 #include "vm_util.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 #define PAGEMAP_FILE_PATH "/proc/self/pagemap"
 #define TEST_ITERATIONS 10000
tools/testing/selftests/mm/split_huge_page_test.c renamed from tools/testing/selftests/mm/split_huge_page_test.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -21,7 +21,7 @@
 #include <time.h>
 #include "vm_util.h"
 #include "kselftest.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 uint64_t pagesize;
 unsigned int pageshift;
tools/testing/selftests/mm/thp_settings.c deleted +0 -397

397 lines not on this page · raw message

tools/testing/selftests/mm/thp_settings.h deleted +0 -89

89 lines not on this page · raw message

tools/testing/selftests/mm/transhuge-stress.c renamed from tools/testing/selftests/mm/transhuge-stress.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -17,7 +17,7 @@
 #include <sys/mman.h>
 #include "vm_util.h"
 #include "kselftest.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 
 int backing_fd = -1;
 int mmap_flags = MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE;
tools/testing/selftests/mm/uffd-wp-mremap.c renamed from tools/testing/selftests/mm/uffd-wp-mremap.c~selftests-mm-rename-thp_settings-to-hugepage_settings +1 -1
@@ -8,7 +8,7 @@
 #include <linux/mman.h>
 #include <sys/mman.h>
 #include "kselftest.h"
-#include "thp_settings.h"
+#include "hugepage_settings.h"
 #include "uffd-common.h"
 
 static int pagemap_fd;

_

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