From nobody Sun Apr 16 11:10:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PznXl0z5bz458V3; Sun, 16 Apr 2023 11:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PznXl07Bvz41v7; Sun, 16 Apr 2023 11:10:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZR+wrsz+3gWS5yExK9Uvbyr0HnjtXa78nZgK7vOgwoA=; b=Zh+c7NuKHUkGfgiUAM40Pi9/v3ehx22WVQYLLFlBgXC2bvUknf7L++enwcTN4q3QlfAA4s bjRbkVkQ+YscWDGJq2Q2wKDZtDmWb+xyu3XmpmqYWmm9iIgej5tqB2dwwnVJ0bvJzLtqHd Xei8q1Y0fNrbusoHyse7WXGK7j2wL6LQt28Vp/245MnCwzcMN/18FF8kybOgIf6iE/KvJg Y7Lw/VpzL0jEWFINoTsABnnR9p5sqV3uGYsNlZqfmVG0HwzoCt7jPkiuTjVt63t206aW0W ob2dOWjiKiGVxYEtzPBVQv8dxIYUHCBlbVQnuQdIebRfcyXHJUp25nrgUmFC0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681643431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZR+wrsz+3gWS5yExK9Uvbyr0HnjtXa78nZgK7vOgwoA=; b=POFW6Xxb7PDnIAytRaC4GY+wST44XwLTwUYZ9VqBpzP13p4Gzc9rDcqv6iCid6iNHI8wHe Q8g0ksTD3pm+3gQsqAokq1EOFGk+m9tcSvy9H5dgSjr1EJH2OnFWQ0g0mOEiLO9CnYSoFi Q7Hr6WzmxSr79V3XiI7cYIbsTKePGszT0U0df+TQJy7xWMhFJzjfa2LEpmHj9GXdmSB3Px z4O5cZxZWo0vCkqSnFybddq5eGGbYU4GDBEayglJItiu8ZQRgLY24G5+DUGD1Jk/ZsvABO XAy00SSdQdTWAroGTG03Qg/VTbGRXsUrtZbtscWeJOs19RKGMHWsB+lIDciMNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681643431; a=rsa-sha256; cv=none; b=xZ5Ir6kIFddXpXkHL8KtbvEep4h+PrJI3OluByut25+r5reUm8zThXLuNKJB57/LYKeYjA PtuhjZ8RwswHKucZp7uCs2vDfYNfo9L+Co+e9CF7EG7keXMogWps5/K5onNp1Hmr4ylfIu 20Q7tTkB3H+kUX5sb23PRA84XD2zgGtuoOCCpJZw1NL1+mAfJq2UbnVgnUYVauVWpnX8Sv r+8NwW4/hAieZv91sI9myimRZX+cwY+VxPb6beeSf4qU+2QgDc+RQ/b7FCaR5h8A0Qbifc WIchWkiz4Si/3ye4zRrCF3FIsWAJMC84NkfaIWA9DNtT1KbySo6+hZ/o8lGAEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PznXk6JggzlYY; Sun, 16 Apr 2023 11:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GBAUgP048031; Sun, 16 Apr 2023 11:10:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GBAUaY048029; Sun, 16 Apr 2023 11:10:30 GMT (envelope-from git) Date: Sun, 16 Apr 2023 11:10:30 GMT Message-Id: <202304161110.33GBAUaY048029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e6aa3c8db0e5 - stable/13 - Rename kqueue1(2) to kqueuex(2) to avoid compat issues with NetBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e6aa3c8db0e5e537f939f451bde10a33a9d8feab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6aa3c8db0e5e537f939f451bde10a33a9d8feab commit e6aa3c8db0e5e537f939f451bde10a33a9d8feab Author: Konstantin Belousov AuthorDate: 2023-03-31 22:27:00 +0000 Commit: Konstantin Belousov 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);