Skip to contentSkip to conversation

selftests-make-use-of-gup_test_file-macro.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 17, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

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 <[email protected]>
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.

Fixes 17de1e559cf1 ("selftests: clarify common error when running gup_test")

---

 tools/testing/selftests/vm/gup_test.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/vm/gup_test.c renamed from tools/testing/selftests/vm/gup_test.c~selftests-make-use-of-gup_test_file-macro +2 -2
@@ -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 [email protected] are