git: e6aa3c8db0e5 - stable/13 - Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=e6aa3c8db0e5e537f939f451bde10a33a9d8feab

commit e6aa3c8db0e5e537f939f451bde10a33a9d8feab
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-03-31 22:27:00 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-04-16 10:59:44 +0000

    Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD
    
    (cherry picked from commit dac310248826c37b60306c1b25fb94c35802196d)
---
 lib/libc/sys/Makefile.inc | 2 +-
 lib/libc/sys/Symbol.map   | 2 +-
 lib/libc/sys/kqueue.2     | 6 +++---
 sys/kern/kern_event.c     | 2 +-
 sys/kern/syscalls.master  | 2 +-
 sys/sys/event.h           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 4152d01a0f3d..23ab196c5f46 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -430,7 +430,7 @@ MLINKS+=jail.2 jail_attach.2 \
 	jail.2 jail_set.2
 MLINKS+=kldunload.2 kldunloadf.2
 MLINKS+=kqueue.2 kevent.2 \
-	kqueue.2 kqueue1.2 \
+	kqueue.2 kqueuex.2 \
 	kqueue.2 EV_SET.3
 MLINKS+=link.2 linkat.2
 MLINKS+=madvise.2 posix_madvise.2
diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
index 503e4e5ca657..6b81c92dbe93 100644
--- a/lib/libc/sys/Symbol.map
+++ b/lib/libc/sys/Symbol.map
@@ -418,7 +418,7 @@ FBSD_1.6 {
 
 FBSD_1.7 {
 	 _Fork;
-	kqueue1;
+	kqueuex;
 	swapoff;
 };
 
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index dbe0dad532c0..2996b0f02109 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -38,7 +38,7 @@
 .Ft int
 .Fn kqueue "void"
 .Ft int
-.Fn kqueue1 "u_int flags"
+.Fn kqueuex "u_int flags"
 .Ft int
 .Fo kevent
 .Fa "int kq"
@@ -92,7 +92,7 @@ flag, then the descriptor table is shared,
 which will allow sharing of the kqueue between two processes.
 .Pp
 The
-.Fn kqueue1
+.Fn kqueuex
 system call also creates a new kernel event queue, and additionally takes
 the
 .Fa flags
@@ -105,7 +105,7 @@ The returned file descriptor is automatically closed on
 The
 .Ql fd = kqueue()
 call is equivalent to
-.Ql fd = kqueue1(0) .
+.Ql fd = kqueuex(0) .
 .Pp
 The
 .Fn kevent
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 29485f3a39db..f580ed10eb8d 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1059,7 +1059,7 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap)
 }
 
 int
-sys_kqueue1(struct thread *td, struct kqueue1_args *uap)
+sys_kqueuex(struct thread *td, struct kqueuex_args *uap)
 {
 	int flags;
 
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 7705cab0da77..f4e8e071b42a 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -3284,7 +3284,7 @@
 		);
 	}
 583	AUE_KQUEUE	STD|CAPENABLED {
-		int kqueue1(
+		int kqueuex(
 		    u_int flags
 		);
 	}
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 36e965f853fc..f204ab8fe0b5 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -216,7 +216,7 @@ struct kevent32_freebsd11 {
 #define NOTE_NSECONDS		0x00000008	/* data is nanoseconds */
 #define	NOTE_ABSTIME		0x00000010	/* timeout is absolute */
 
-/* Flags for kqueue1(2) */
+/* Flags for kqueuex(2) */
 #define	KQUEUE_CLOEXEC	0x00000001	/* close on exec */
 
 struct knote;
@@ -360,7 +360,7 @@ struct timespec;
 
 __BEGIN_DECLS
 int     kqueue(void);
-int     kqueue1(unsigned flags);
+int     kqueuex(unsigned flags);
 int     kevent(int kq, const struct kevent *changelist, int nchanges,
 	    struct kevent *eventlist, int nevents,
 	    const struct timespec *timeout);