From nobody Mon Dec 06 15:55:15 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 615BC18C3EB0; Mon, 6 Dec 2021 15:55:18 +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 4J77LF034lz4Zlq; Mon, 6 Dec 2021 15:55:16 +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 EDC1868BA; Mon, 6 Dec 2021 15:55:15 +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 1B6FtFCd032711; Mon, 6 Dec 2021 15:55:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FtFI0032710; Mon, 6 Dec 2021 15:55:15 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:55:15 GMT Message-Id: <202112061555.1B6FtFI0032710@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: ae972a82c024 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: ae972a82c0246251a3f0ac16f6d0e5f251f841a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806117; 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=NusQyv+1cVnVFuE/fJV0C6f0tEzTB4YP3NE0XiyHBMk=; b=MGNBDPzzQMpvfbV2nlFr70Ssz0a3W5bkFDTlkkBN9reU5GbF2JVhACe2ux9LACpkON2P15 0iqkbiZF4PvT/wxRS81YqdRq/htt4w7Pshom68msc9wY3PzYYKGhS4ADvuHzsC5gRsvGRw gkbewCGoNYmGKY5HK8QqJmUqD9Tq6xx9c0/odyvzQLVhqJJ/ijgpTlVygVCyP38H79j0Fv v01K3OF1okKjS1bPFsqRzC62rqTlFivFBp142UH1gctm6ECEVpd8GLWZPqtitKe5u21+EI HHMc3Z4XcDTqiPzxoWoHcIxp7LjWfLHB18OyPqy1JC7C2Om09tgauCjhW6uhIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806117; a=rsa-sha256; cv=none; b=EOP8+L4pkRsmuSwZ9Sk7tE7Sb5lmnpOQEXOFgllPNeUgj2JdDlzf+P1p/H8hyUk1GhVwz8 7HGNNTuEuPXjR2Vy/vav/6jfSmf+MUwsWfEVvw7DuRP6Y1cXNxCATUz+gbm6i+25zhM0jn 4bYv1vF2QRcWfmLxwuiflavkz51nxPgxw7j3pvsn7Elr3olbgIlJI+EkNgULoF44hXv6rm TUhVRRf4Ih+nu5+SLzX9wGOFXmuyqmkkeamgxwEbTpDSLtH8PQIWDUzqjkykW+LJmWJ695 WY+992R4GPGV7T0sd6v9NkQ3nW4Ed3SfYP+cfVedC93dnYZXLPZDvjdbsWZueQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae972a82c0246251a3f0ac16f6d0e5f251f841a4 commit ae972a82c0246251a3f0ac16f6d0e5f251f841a4 Author: Warner Losh AuthorDate: 2021-11-23 17:51:46 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:54:10 +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 ef1d87ada9f6..e7c81f4f0621 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