* [merged mm-stable] selftests-make-use-of-gup_test_file-macro.patch removed from -mm tree
@ 2022-06-17 2:49 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2022-06-17 2:49 UTC (permalink / raw)
To: mm-commits, skhan, npache, jsavitz, akpm
The quilt patch titled
Subject: selftests: make use of GUP_TEST_FILE macro
has been removed from the -mm tree. Its filename was
selftests-make-use-of-gup_test_file-macro.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: Joel Savitz <jsavitz@redhat.com>
Subject: selftests: make use of GUP_TEST_FILE macro
Date: Thu, 9 Jun 2022 16:32:17 -0400
Commit 17de1e559cf1 ("selftests: clarify common error when running
gup_test") had most of its hunks dropped due to a conflict with another
patch accepted into Linux around the same time that implemented the same
behavior as a subset of other changes.
However, the remaining hunk defines the GUP_TEST_FILE macro without making
use of it. This patch makes use of the macro in the two relevant places.
Furthermore, the above mentioned commit's log message erroneously
describes the changes that were dropped from the patch.
This patch corrects the record.
Link: https://lkml.kernel.org/r/20220609203217.3206247-1-jsavitz@redhat.com
Fixes: 17de1e559cf1 ("selftests: clarify common error when running gup_test")
Signed-off-by: Joel Savitz <jsavitz@redhat.com>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Acked-by: Nico Pache <npache@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
tools/testing/selftests/vm/gup_test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tools/testing/selftests/vm/gup_test.c~selftests-make-use-of-gup_test_file-macro
+++ a/tools/testing/selftests/vm/gup_test.c
@@ -209,7 +209,7 @@ int main(int argc, char **argv)
if (write)
gup.gup_flags |= FOLL_WRITE;
- gup_fd = open("/sys/kernel/debug/gup_test", O_RDWR);
+ gup_fd = open(GUP_TEST_FILE, O_RDWR);
if (gup_fd == -1) {
switch (errno) {
case EACCES:
@@ -224,7 +224,7 @@ int main(int argc, char **argv)
printf("check if CONFIG_GUP_TEST is enabled in kernel config\n");
break;
default:
- perror("failed to open /sys/kernel/debug/gup_test");
+ perror("failed to open " GUP_TEST_FILE);
break;
}
exit(KSFT_SKIP);
_
Patches currently in -mm which might be from jsavitz@redhat.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-17 2:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-17 2:49 [merged mm-stable] selftests-make-use-of-gup_test_file-macro.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.