From nobody Tue Nov 29 10:39:08 2022 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 4NLzND5Vksz4jT1V; Tue, 29 Nov 2022 10:39:08 +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 4NLzND4vbVz3tCM; Tue, 29 Nov 2022 10:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669718348; 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=yak6Bgr+CE4VIpJdGomUsGqq2Cca56q9WDqoBMowjJo=; b=DnBdw6/aBcofm6rWeiG2+oCCSHUguctKaxs6PL2cLCHRiXu67oudl+VwZ4eenqHa7osFXW I0RYujpbrxT10xG27yA56Q2nqekinGT5FfomGsI0E1FlLzF8lU1zAdP7O5NXseE1wdrbwT e+4X+GWbaw3koLfDWH+QhQ2/AkfCPH+BXc4NuoBrbVdmqJW3UWbT64OHwhVniDMmP1eHTm AzqmDRNsX/tZ9qMfZ6Nj/6Ixz/bKenSPt70JzkNLBCvUeqGp9+5bVovQfwMggMFzyNI+e4 A9EslTBlOxe0/e7efqDW5M2N5zN7BiYTiOxIm6ppD1aDDt/xxcixEbNhy5bx2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669718348; 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=yak6Bgr+CE4VIpJdGomUsGqq2Cca56q9WDqoBMowjJo=; b=b5Pw9BK+H05mPQWEFJMoBmOud5r8Du3mNNU3ORhMR5r3wEHNultnXoQ0CgjxBPMEx91Gu9 /CiFDFZjkmS5ALVxwnqMpSkNsz3LN4AvnF6a2h6XItm28nS/69KX+eElrukCzRpYVxIY8x py5yS9qtby6wDgzQ/vC4USMOi1IfbVypEzLeh6z8EULObJX/bw+keLQp7eO+MNmoZrWGyu 6bUjU8LeEjsgtfIVpQtAKaHWM4c6Yahy1nIiOfAjJqVIf0dHnZIGfL0SLx5ypRqNB7sNkP TlqYyuBkjjzffq5kWkNTU+mbto3o58yyTcPtDonra8lQCXAbJJ1VYXWRBlOLxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669718348; a=rsa-sha256; cv=none; b=a+/Jzs9Gvwto7G1jpV5dLAeDa3p5etfH3ITGEpKnBozVw5a0H9Y0j1JaX44yTzLOGXU1uQ Q2+DMtj63SPDhOSgIwhxyKfYM8ueapu17cVKP/XVs2dvKATrpUHkUvB3EAXYatcuB6UX8V pTI8tua/c2EQtq3y1aXNnbVKCXWr2QInI1VT0ZKvrv+/br0+qGvYv+jF9n2ef4rs7dIce5 sAroULzdRsi1vVV/yVDwL73gEnECfE1GyndSr4uxUCSA5yh0n3Ybtuqv7dMBL9vP4ofmTm CuCYOE1Tn4GRreoKTp29ijy1CCxY/kiBeuLuCVAdHSyZMHC6dIzjMdLUfWOHow== 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 4NLzND40VvzDnc; Tue, 29 Nov 2022 10:39:08 +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 2ATAd8LM045091; Tue, 29 Nov 2022 10:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATAd8pD045090; Tue, 29 Nov 2022 10:39:08 GMT (envelope-from git) Date: Tue, 29 Nov 2022 10:39:08 GMT Message-Id: <202211291039.2ATAd8pD045090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 77fcf1a3982e - stable/13 - linuxkpi: Add EPOLL aliases 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 77fcf1a3982e6f9399ac7167923d8486ceaae1c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=77fcf1a3982e6f9399ac7167923d8486ceaae1c3 commit 77fcf1a3982e6f9399ac7167923d8486ceaae1c3 Author: Jake Freeland AuthorDate: 2022-09-20 17:37:08 +0000 Commit: Emmanuel Vadot CommitDate: 2022-11-29 10:09:35 +0000 linuxkpi: Add EPOLL aliases Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36527 Sponsored by: Google, Inc. (GSoC 2022) (cherry picked from commit a06eeeaa1d0d62ea293a0bc73f813e5a98ccd405) --- .../linuxkpi/common/include/linux/eventpoll.h | 45 ++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/poll.h | 1 + 2 files changed, 46 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/eventpoll.h b/sys/compat/linuxkpi/common/include/linux/eventpoll.h new file mode 100644 index 000000000000..1651ad01a55f --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/eventpoll.h @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022, Jake Freeland + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_EVENTPOLL_H_ +#define _LINUXKPI_LINUX_EVENTPOLL_H_ + +#include + +#define EPOLLIN POLLIN +#define EPOLLPRI POLLPRI +#define EPOLLOUT POLLOUT +#define EPOLLERR POLLERR +#define EPOLLHUP POLLHUP +#define EPOLLNVAL POLLNVAL +#define EPOLLRDNORM POLLRDNORM +#define EPOLLRDBAND POLLRDBAND +#define EPOLLWRNORM POLLWRNORM +#define EPOLLWRBAND POLLWRBAND +#define EPOLLRDHUP POLLRDHUP + +#endif /* _LINUXKPI_LINUX_EVENTPOLL_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/poll.h b/sys/compat/linuxkpi/common/include/linux/poll.h index ff83fb1959f6..d3c0d4603b2d 100644 --- a/sys/compat/linuxkpi/common/include/linux/poll.h +++ b/sys/compat/linuxkpi/common/include/linux/poll.h @@ -34,6 +34,7 @@ #include #include +#include #include #include