From nobody Tue Sep 20 18:13:54 2022 X-Original-To: dev-commits-src-main@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 4MX8nH4KCcz4d1kT; Tue, 20 Sep 2022 18:13:55 +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 4MX8nH1F7qz3yL0; Tue, 20 Sep 2022 18:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663697635; 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=6fS802PE3KVKt9HD4voQlgySpalpbYnc870cvWlrmXg=; b=Q4OxzjjeXEC9khFFmNIN5wf527vcoPrApVqWyBE7dBsY/N1OoB10Daj6902BiJu3UmvcAg BEG6aIHxhcU7CYI2x1zukesalFaq+l8M6uKfTpiBS3+My70mI8e5+NMssvX6ZuSGdxEfF5 CLhdMVOBSSp4YNigjY8/wF6DskZTOB7qc0Jx7ZzKIjR2Yt7kj/gL6ZaV/Ffd3GcQZoCT72 CFtyftA/wMCKCn8Xde30ne+x689/A99fiSNvmxAUmNG2v6u/TZbVZVNaIUVFNwgrfZSExn xG2fa3/OkdpyYbmY66w6M9hHDyCnOmIOxVQc/ROwamsrw48yVqGs3/t8dpkRBw== 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 4MX8nH0LrJznlh; Tue, 20 Sep 2022 18:13:55 +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 28KIDs4G022766; Tue, 20 Sep 2022 18:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28KIDsQO022765; Tue, 20 Sep 2022 18:13:54 GMT (envelope-from git) Date: Tue, 20 Sep 2022 18:13:54 GMT Message-Id: <202209201813.28KIDsQO022765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: a06eeeaa1d0d - main - linuxkpi: Add EPOLL aliases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a06eeeaa1d0d62ea293a0bc73f813e5a98ccd405 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663697635; 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=6fS802PE3KVKt9HD4voQlgySpalpbYnc870cvWlrmXg=; b=eglwxIHVXRtNKP8HpVu09hyxlIOcxAdogKHJ4UyGYzrObVO+e++uDjDMYEQMeioQ+TOhgC /l5LLtHXehkTQ5NDbsaMvZSmlBXjn4fGGAcMYRBfb0dtHyz73UrawvY0Sv2J6oB2SaGv1+ gsEIMU2cED88U1e9JiI2D6fek7zMNJnGkv9AkTdXBlDLV+Fk6OtndatRIspISrEAikDOnG WOl7jwL1jO/m60W1wRTjtV48cgs8vsYet8WcKJkmX7eCXV7MUWv9KD2kT/UBn2iADDUFao ByzVJHN101OmIl0wlIW6rDQB1hOXzXvSYYDXytxEriiw07q9rXllyqUjKyTGoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663697635; a=rsa-sha256; cv=none; b=MGlIqBXUzsHbmQgBId4s+BzOeCxOSAZJtFJD3CMmcpMjvdTQTlOuM2hLYTo82gi8NxuAOy /rXAORw4z7NfNON+XOMa5JLvDjy/UXGXHJlFpIUp5/PE7Fv7x1wBsnCIyb8dg/eIycc5vy eYk17bcTIcESJLUi4zQ4BssQoXEondTeoifywyvAOCMZGbc+oOmkA0Ivg/8Reb17Cfo32O 1uwnkomLS5OvwNviEEDcQ0gMv2ZvNMfvWpyLlWXNxt/MD89M8owOEGK8hjTW7OxkmQzF4N WVLVqsvLXoUlWyEg5fk094ssEdxf+INsgzEZay6rL0oj1mQ3aPUPpqBLO6HVzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a06eeeaa1d0d62ea293a0bc73f813e5a98ccd405 commit a06eeeaa1d0d62ea293a0bc73f813e5a98ccd405 Author: Jake Freeland AuthorDate: 2022-09-20 17:37:08 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-20 17:39:52 +0000 linuxkpi: Add EPOLL aliases Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36527 Sponsored by: Google, Inc. (GSoC 2022) --- .../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