From nobody Tue Nov 23 20:30:27 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 AFF35189C847; Tue, 23 Nov 2021 20:30:27 +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 4HzG3l37Clz4YkV; Tue, 23 Nov 2021 20:30:27 +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 4B8941D0CB; Tue, 23 Nov 2021 20:30:27 +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 1ANKURj8018562; Tue, 23 Nov 2021 20:30:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANKUR5A018561; Tue, 23 Nov 2021 20:30:27 GMT (envelope-from git) Date: Tue, 23 Nov 2021 20:30:27 GMT Message-Id: <202111232030.1ANKUR5A018561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 910919219716 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9109192197166e72ce0c04e5f04fc82f35a82f40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637699427; 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=ofi7cJmRf13CbeoWLhqk+CEYx4qtFzM1YoeqtBGAC7Q=; b=gDYUPucXmMIuGFXM/94VI/e5rN/txKwN27MmMDI23p3hx4kK/QL1Yn1c6jONaJl0fHLwvb ulbw/vtUEtSz1TGYdyqUpD9oYOKph3PyNN92IgbC8WwYZwuvkqV7LR8EeKG+ny0VNNNvs+ Vxmi7pUm3icmY0bEHBzSnmnV2+blte+82lo/t3LfHGT8N/OHzwr0OWGFmxam05M1IHXvGs E224c/6wIMFABOjLMWvqB39f0FOJ5aeKr7vvFebmnfhyERUsPL5wQ3NOE1AcIhYlnNOs4O ZHWAu8iihCXI/RtZVEVc0cigPkj+6hUlSm7j620chxhOuzy6XeDkS22ixUaq3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637699427; a=rsa-sha256; cv=none; b=aBFSTxkSaIrJA5YjKlXl+kF27QRFkDnGpzprubNoPHjRMEXiPxuCvPg5Fjj0EqS7YN9KVK B1MFnaRlFakbPbjAUuZ94RREV2oDlzLc9NdLcrqHT9oUoCOrOVHnBIkVNg81YCCqON/9X6 QMbODX6FU1b/jzy/wqznyJhjwpYMK4FL6yx/Ab4IOzj2kuVwag3i5OfPJb4DZWFbaIbU1p M9pnNE/tXa0wNT0jkNjSeBnTuzqeJzrYZS/2Z+fOCcomqhAiZ5EBypFc+VxpKZ/265yn1s AyEXT4Is4T62XchqX8y7Be0UREidMBx43GnP9OnyHkiN0jJRDMgp4n2eFtfPmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9109192197166e72ce0c04e5f04fc82f35a82f40 commit 9109192197166e72ce0c04e5f04fc82f35a82f40 Author: Warner Losh AuthorDate: 2021-11-23 17:51:46 +0000 Commit: Warner Losh CommitDate: 2021-11-23 20:29:24 +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 --- 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 7d337d40c1e6..05eddfd681b1 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -105,29 +105,29 @@ struct freebsd11_kevent { #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 freebsd11_kevent32 { - 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