From nobody Mon Dec 06 15:56:24 2021 X-Original-To: dev-commits-src-all@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 08A0818C5672; Mon, 6 Dec 2021 15:56:26 +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 4J77MY0xdbz4bd9; Mon, 6 Dec 2021 15:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8E35368C3; Mon, 6 Dec 2021 15:56:24 +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 1B6FuO9i033487; Mon, 6 Dec 2021 15:56:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FuOux033486; Mon, 6 Dec 2021 15:56:24 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:56:24 GMT Message-Id: <202112061556.1B6FuOux033486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: af92db385ca0 - stable/13 - kqueue: Define older kqueue event types better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: af92db385ca0921fadbe483f1cd1bf39826f0f7f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806186; 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=aD39tHX7cjEdhJxnI1/LCG96GWV7nxrmSBky2QKYJmA=; b=HfzRaFfAsoOuupqN/EaTe5vn+sLZ0W4d0LIk7gmlJSMItsI1kFana2ZotBIQXozvqItIB1 A7eJV7lexY7HaSoUVCe4q1SKQ3zLme8pXrrzjDnMZUbGfJ/xtWkphAC2D6pQGnXFsBITpX lTnqGGCmnSh2U0iUmqxKzHXCLNIlmipSeom7AZhhU+VgrRqj/80hqHMJoXbmMwcrZ7SO6v +CHjAyAydOrTdXJ0GeLO5q57TjqWt/leG0iNCFt3ku+aohFbCTlJSFKrFHdaoHMe6BkFf3 nRIkIV1itf4EudOUBYhBgouM98iOVPcoOnQPrEz3y4pfUWQ2zpY3jRSgHPJ4aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806186; a=rsa-sha256; cv=none; b=YwanyL4Mtt2RDxW34ZE3LbNtER4ZjF8wud9zXUVVtNBToiHp4pLtuhNxb8gtb91NJZDq59 +A6CFKCV/zMFgvs4rZ9VP2w/epEc/7/uKw0HHuIY1gjYFopMyOruxyZcuRv+vSKyY4zO5p bpD3FHzW3U96YInbOP/nHvxr6HdAF+ZfHKEtByGQECoReWPbnRidikalC6UxbcComD925s dhzm2LsePsteyO1Jo7eQL4gFb1yO2S/gPp/K0gVP6giDcJNee87T2mBwNwJRv08GJsd4lG nu8kJj35XMsrOlGKy6GW37ib1zE92DVyUT7MVhj0Ljad9C+eQP7Ck2Z0O3BfSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af92db385ca0921fadbe483f1cd1bf39826f0f7f commit af92db385ca0921fadbe483f1cd1bf39826f0f7f Author: Warner Losh AuthorDate: 2021-11-23 17:51:46 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:55:56 +0000 kqueue: Define older kqueue event types better struct kqueue is designed to live in a restricted namespace, but the older compat versions are not. Shift to using unsigned short instead of u_short, unsigned int instead of u_int and the __*int*_t types instead of the unprefiexed versions. Sponsored by: Netflix Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D33056 (cherry picked from commit 9109192197166e72ce0c04e5f04fc82f35a82f40) --- sys/sys/event.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/sys/event.h b/sys/sys/event.h index 833292c989b7..b6704f4b4b50 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -104,29 +104,29 @@ struct kevent_freebsd11 { #if defined(_WANT_KEVENT32) || (defined(_KERNEL) && defined(__LP64__)) struct kevent32 { - uint32_t ident; /* identifier for this event */ + __uint32_t ident; /* identifier for this event */ short filter; /* filter for event */ - u_short flags; - u_int fflags; + unsigned short flags; + unsigned int fflags; #ifndef __amd64__ - uint32_t pad0; + __uint32_t pad0; #endif - uint32_t data1, data2; - uint32_t udata; /* opaque user data identifier */ + __uint32_t data1, data2; + __uint32_t udata; /* opaque user data identifier */ #ifndef __amd64__ - uint32_t pad1; + __uint32_t pad1; #endif - uint32_t ext64[8]; + __uint32_t ext64[8]; }; #ifdef _WANT_FREEBSD11_KEVENT struct kevent32_freebsd11 { - u_int32_t ident; /* identifier for this event */ + __uint32_t ident; /* identifier for this event */ short filter; /* filter for event */ - u_short flags; - u_int fflags; - int32_t data; - u_int32_t udata; /* opaque user data identifier */ + unsigned short flags; + unsigned int fflags; + __int32_t data; + __uint32_t udata; /* opaque user data identifier */ }; #endif #endif