From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 28 Jul 2021 11:54:31 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.10.54~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b57a4d1bcfc2293fca8f61ac4cab0e2bb6419b2;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
---

diff --git a/queue-5.4/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch b/queue-5.4/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
new file mode 100644
index 00000000000..af6a222a516
--- /dev/null
+++ b/queue-5.4/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
@@ -0,0 +1,27 @@
+From a328a9deaa6d57cedbc05ba47c0b1e4a8f346b6a 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
+@@ -141,7 +141,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;
+ 	}