From 2a8b21b5591ab30950bd3ae697e12e4041b6f151 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Aug 2021 12:45:37 +0200 Subject: [PATCH] 5.10-stable patches added patches: selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch --- ...s-testing-selftests-vm-userfaultfd.c.patch | 28 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 29 insertions(+) create mode 100644 queue-5.10/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch 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 index 00000000000..35e125e827e --- /dev/null +++ b/queue-5.10/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch @@ -0,0 +1,28 @@ +From 74c9985e30cf576ee19f877a40eec4d0fe076308 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +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 + +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 + +--- + 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; + } diff --git a/queue-5.10/series b/queue-5.10/series index 438b3abbbe8..2d6b841db62 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -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 -- 2.47.3