selftests-mm-fix-build-failures-due-to-missing-madv_collapse.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: fix build failures due to missing MADV_COLLAPSE
has been removed from the -mm tree. Its filename was
selftests-mm-fix-build-failures-due-to-missing-madv_collapse.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: John Hubbard <[email protected]>
Subject: selftests/mm: fix build failures due to missing MADV_COLLAPSE
Date: Tue, 6 Jun 2023 00:16:34 -0700
MADV_PAGEOUT, MADV_POPULATE_READ, MADV_COLLAPSE are conditionally defined as necessary. However, that was being done in .c files, and a new build failure came up that would have been automatically avoided had these been in a common header file.
So consolidate and move them all to vm_util.h, which fixes the build failure.
An alternative approach from Muhammad Usama Anjum was: rely on "make headers" being required, and include asm-generic/mman-common.h. This works in the sense that it builds, but it still generates warnings about duplicate MADV_* symbols, and the goal here is to get a fully clean (no warnings) build here.
---
tools/testing/selftests/mm/cow.c | 7 ------- tools/testing/selftests/mm/khugepaged.c | 10 ---------- tools/testing/selftests/mm/vm_util.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 17 deletions(-)
tools/testing/selftests/mm/cow.c renamed from tools/testing/selftests/mm/cow.c~selftests-mm-fix-build-failures-due-to-missing-madv_collapse +0 -7
@@ -29,13 +29,6 @@#include "../kselftest.h" #include "vm_util.h" -#ifndef MADV_PAGEOUT -#define MADV_PAGEOUT 21 -#endif -#ifndef MADV_COLLAPSE -#define MADV_COLLAPSE 25 -#endif -static size_t pagesize;static int pagemap_fd;static size_t thpsize;
tools/testing/selftests/mm/khugepaged.c renamed from tools/testing/selftests/mm/khugepaged.c~selftests-mm-fix-build-failures-due-to-missing-madv_collapse +0 -10
@@ -22,16 +22,6 @@#include "vm_util.h" -#ifndef MADV_PAGEOUT -#define MADV_PAGEOUT 21 -#endif -#ifndef MADV_POPULATE_READ -#define MADV_POPULATE_READ 22 -#endif -#ifndef MADV_COLLAPSE -#define MADV_COLLAPSE 25 -#endif -#define BASE_ADDR ((void *)(1UL << 30))static unsigned long hpage_pmd_size;static unsigned long page_size;
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-fix-build-failures-due-to-missing-madv_collapse +10 -0
@@ -64,3 +64,13 @@ int uffd_register_with_ioctls(int uffd,#define PAGEMAP_PRESENT (ent) (((ent) & (1ull << 63)) != 0)#define PAGEMAP_PFN (ent) ((ent) & ((1ull << 55) - 1)) + +#ifndef MADV_PAGEOUT +#define MADV_PAGEOUT 21 +#endif +#ifndef MADV_POPULATE_READ +#define MADV_POPULATE_READ 22 +#endif +#ifndef MADV_COLLAPSE +#define MADV_COLLAPSE 25 +#endif
_
Patches currently in -mm which might be from [email protected] are