drop queue-6.1/selftests-vm-remove-__use_gnu-in-hugetlb-madvise.c.patch

breaks the build

diff --git a/queue-6.1/selftests-vm-remove-__use_gnu-in-hugetlb-madvise.c.patch b/queue-6.1/selftests-vm-remove-__use_gnu-in-hugetlb-madvise.c.patch
deleted file mode 100644 (file)
index a9ce088..0000000
--- a/queue-6.1/selftests-vm-remove-__use_gnu-in-hugetlb-madvise.c.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 30bd9afe6d55a72cec45bf4a4aa710c601297d6d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 16 Jan 2023 11:33:07 -0500
-Subject: selftests/vm: remove __USE_GNU in hugetlb-madvise.c
-
-From: Peter Xu <peterx@redhat.com>
-
-[ Upstream commit 0ca2c535f5a07f01118a6a70bfab78576e02fcae ]
-
-__USE_GNU should be an internal macro only used inside glibc.  Either
-memfd_create() or fallocate() requires _GNU_SOURCE per man page, where
-__USE_GNU will further be defined by glibc headers include/features.h:
-
-  #ifdef _GNU_SOURCE
-  # define __USE_GNU   1
-  #endif
-
-This fixes:
-
-   >> hugetlb-madvise.c:20: warning: "__USE_GNU" redefined
-      20 | #define __USE_GNU
-         |
-   In file included from /usr/include/x86_64-linux-gnu/bits/libc-header-start.h:33,
-                    from /usr/include/stdlib.h:26,
-                    from hugetlb-madvise.c:16:
-   /usr/include/features.h:407: note: this is the location of the previous definition
-     407 | # define __USE_GNU      1
-         |
-
-Link: https://lkml.kernel.org/r/Y8V9z+z6Tk7NetI3@x1n
-Signed-off-by: Peter Xu <peterx@redhat.com>
-Reported-by: kernel test robot <lkp@intel.com>
-Cc: Mike Kravetz <mike.kravetz@oracle.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/vm/hugetlb-madvise.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tools/testing/selftests/vm/hugetlb-madvise.c b/tools/testing/selftests/vm/hugetlb-madvise.c
-index 3c9943131881..b3f01f1f7a60 100644
---- a/tools/testing/selftests/vm/hugetlb-madvise.c
-+++ b/tools/testing/selftests/vm/hugetlb-madvise.c
-@@ -16,7 +16,6 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/mman.h>
--#define __USE_GNU
- #include <fcntl.h>
- 
- #define USAGE "USAGE: %s <hugepagefile_name>\n"
--- 
-2.39.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 313cd689d73fc23e2e71e142f9a96cfc8fcc6e1f..ff2491bf6aee2e1b89e01b8b6cdd942a744d33a0 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -9,7 +9,6 @@ asoc-intel-bytcr_rt5640-drop-reference-count-of-acpi.patch
 asoc-intel-bytcr_wm5102-drop-reference-count-of-acpi.patch
 asoc-intel-sof_es8336-drop-reference-count-of-acpi-d.patch
 asoc-intel-avs-implement-pci-shutdown.patch
-selftests-vm-remove-__use_gnu-in-hugetlb-madvise.c.patch
 bpf-fix-off-by-one-error-in-bpf_mem_cache_idx.patch
 bpf-fix-a-possible-task-gone-issue-with-bpf_send_sig.patch
 alsa-hda-via-avoid-potential-array-out-of-bound-in-a.patch