]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Aug 2021 10:45:37 +0000 (12:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Aug 2021 10:45:37 +0000 (12:45 +0200)
added patches:
selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch

queue-5.10/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch b/queue-5.10/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
new file mode 100644 (file)
index 0000000..35e125e
--- /dev/null
@@ -0,0 +1,28 @@
+From 74c9985e30cf576ee19f877a40eec4d0fe076308 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 28 Jul 2021 13:51:58 +0200
+Subject: selftest: fix build error in tools/testing/selftests/vm/userfaultfd.c
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+When backporting 0db282ba2c12 ("selftest: use mmap instead of
+posix_memalign to allocate memory") to this stable branch, I forgot a {
+breaking the build.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/testing/selftests/vm/userfaultfd.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/testing/selftests/vm/userfaultfd.c
++++ b/tools/testing/selftests/vm/userfaultfd.c
+@@ -182,7 +182,7 @@ static void anon_allocate_area(void **al
+ {
+       *alloc_area = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE,
+                          MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+-      if (*alloc_area == MAP_FAILED)
++      if (*alloc_area == MAP_FAILED) {
+               fprintf(stderr, "mmap of anonymous memory failed");
+               *alloc_area = NULL;
+       }
index 438b3abbbe8f323eac75036bb675166eee93f4a3..2d6b841db62a218f5b070d12cda8f27094753da7 100644 (file)
@@ -1,3 +1,4 @@
+selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
 io_uring-fix-null-ptr-deref-in-io_sq_offload_start.patch
 x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
 pipe-make-pipe-writes-always-wake-up-readers.patch