git: cbab32bdf15d - stable/13 - linux: deduplicate DUMMY() entries
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 17 Feb 2022 12:54:29 UTC
The branch stable/13 has been updated by trasz:
URL: https://cgit.FreeBSD.org/src/commit/?id=cbab32bdf15de14c24eaeb38fd757547733c2094
commit cbab32bdf15de14c24eaeb38fd757547733c2094
Author: Edward Tomasz Napierala <trasz@FreeBSD.org>
AuthorDate: 2021-05-29 06:32:50 +0000
Commit: Edward Tomasz Napierala <trasz@FreeBSD.org>
CommitDate: 2022-02-13 22:22:11 +0000
linux: deduplicate DUMMY() entries
No functional changes.
Reviewed By: emaste
Sponsored By: EPSRC
Differential Revision: https://reviews.freebsd.org/D30524
(cherry picked from commit 83043a741d114d7fd4a018e9c70330036ae44f81)
---
sys/arm64/linux/linux_dummy_machdep.c | 7 -------
sys/compat/linux/linux_dummy.c | 10 ++++++++++
sys/x86/linux/linux_dummy_x86.c | 10 ----------
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c
index 47b6ac093cb1..4bd339de4af5 100644
--- a/sys/arm64/linux/linux_dummy_machdep.c
+++ b/sys/arm64/linux/linux_dummy_machdep.c
@@ -61,11 +61,4 @@ DUMMY(mq_timedreceive);
DUMMY(mq_notify);
DUMMY(mq_getsetattr);
DUMMY(semtimedop);
-DUMMY(statx);
-DUMMY(io_pgetevents);
DUMMY(kexec_file_load);
-DUMMY(rseq);
-DUMMY(pidfd_send_signal);
-DUMMY(io_uring_setup);
-DUMMY(io_uring_enter);
-DUMMY(io_uring_register);
diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c
index 5f174d0e4994..fef09809822b 100644
--- a/sys/compat/linux/linux_dummy.c
+++ b/sys/compat/linux/linux_dummy.c
@@ -147,6 +147,16 @@ DUMMY(faccessat2);
DUMMY(process_madvise);
DUMMY(epoll_pwait2);
DUMMY(mount_setattr);
+/* Linux 4.11: */
+DUMMY(statx);
+/* Linux 4.18: */
+DUMMY(io_pgetevents);
+DUMMY(rseq);
+/* Linux 5.0: */
+DUMMY(pidfd_send_signal);
+DUMMY(io_uring_setup);
+DUMMY(io_uring_enter);
+DUMMY(io_uring_register);
#define DUMMY_XATTR(s) \
int \
diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c
index 1defe4e9674e..d6a1ce38da48 100644
--- a/sys/x86/linux/linux_dummy_x86.c
+++ b/sys/x86/linux/linux_dummy_x86.c
@@ -57,13 +57,3 @@ DUMMY(quotactl);
DUMMY(inotify_init);
/* Linux 2.6.22: */
DUMMY(signalfd);
-/* Linux 4.11: */
-DUMMY(statx);
-/* Linux 4.18: */
-DUMMY(io_pgetevents);
-DUMMY(rseq);
-/* Linux 5.0: */
-DUMMY(pidfd_send_signal);
-DUMMY(io_uring_setup);
-DUMMY(io_uring_enter);
-DUMMY(io_uring_register);