From nobody Fri Jun 17 19:39:27 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 19C0E85C261; Fri, 17 Jun 2022 19:39:29 +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 4LPq9q62BVz3R17; Fri, 17 Jun 2022 19:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494768; 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=ck59+u34L64gckH+AwlDS+8CFoiROMRIJlXwN6vBdUU=; b=t++nEnEmNjGN5YcQsGLtuPTba4iQHyLUV/TNTkWsIWjelrPqOjLUMX3Gyefc88kiD9e5Rd W6Vmo5kHCF7hnf77I66uvX5Wn/cn4mUTALqtwifupnJZK8kMtw/kP9F1PUeEeaHAcpgCEW ZIRK77OI1qGqucl6slkN9BfFfhZvV/kgCPKvhJ6TYbcrWgTNeFwh18sEgO+lfq8gqcMADu xf/IqX88QOGSTNq3br+UFeWqTzenIu3vfn6xMmS5yLbMql4Mvjhx+asyVFq1HGEgWIJ5zf FfXJL1GaN8ivf16BZSl0Rr94iP/D8Wl+ZBMJcYANHkputiDa0WRvmfWfv8NbPw== 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 A50AC25AD8; Fri, 17 Jun 2022 19:39: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 25HJdRk5016033; Fri, 17 Jun 2022 19:39:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdR4h016032; Fri, 17 Jun 2022 19:39:27 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:27 GMT Message-Id: <202206171939.25HJdR4h016032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7a865d886114 - stable/13 - linux(4): Change epoll_pwait2 syscall definition to match Linux actual one. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7a865d886114a8a882eb075baf8bd9b6bbd4f4f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494768; 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=ck59+u34L64gckH+AwlDS+8CFoiROMRIJlXwN6vBdUU=; b=k5MvG/nvtR4cyyeKAOibrG+84qOBMCpCLXrlUyK6IGhllba+kb6p5DGSGwGlGILwyq3Pzy UB5cYyGGMLSnQN/VqNDeFqun3u9J9b+6bKLqMjkxsU5pdEv5Xk5vKf2om6c2ILNfbiwyde g40gIC2jqksaxr7gXt0/1ftVTJP2oZ83SzmvkvTgVu7Tn1E+Y/iXuB5WtmiVN/Npj+yxh1 ws079WrCL+nxQ18O9Iot9BaURkdzxzmf7B54IY8sJyou5qRHHw/ren3si4ZADXv5jwSolX vGEUVr2rfYT5xJyCoLgcX5RRltlxGRlVmgXUHh8tC6cdV8TV4KQ/xG9ZoBOZ2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494768; a=rsa-sha256; cv=none; b=gnaAwBubKFmEo6pmaouVwWR+hUYM6fiHRAq7XC8KjVGh42ZSTC9rZq/djYVx3cmdWEejsd 1Tlg+16f9v6F8aUmBoiIMpjLBOI03QgNU3Hayi+reLDD1y8hrBpfkY5jdkeFoTQDAI2ixb 3Y3BiRvzBRykqM6KRdt26wW58B582XD/yjV8gPQ7oPsO1J7lSZ+vQChy6Dd1G+yLLkBpxx Q8VrjAnkZia0IbDCvOvfgdG3thQLI37Syl7EPz7aNd5o4aZ8+E/ay1HDdQSOcVyuUDW4gV h1ESFYY4G5ZuO4zUtL8Pox+Zyh5mDS0Rr/GkV5WKlKcQxvSHvP7jnnzRjkyIDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7a865d886114a8a882eb075baf8bd9b6bbd4f4f3 commit 7a865d886114a8a882eb075baf8bd9b6bbd4f4f3 Author: Dmitry Chagin AuthorDate: 2022-04-26 16:35:57 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:05 +0000 linux(4): Change epoll_pwait2 syscall definition to match Linux actual one. MFC after: 2 weeks (cherry picked from commit 81b0b7dc0c624c2e086943822beda0b08a12e252) --- sys/amd64/linux/syscalls.master | 9 ++++++++- sys/amd64/linux32/syscalls.master | 9 ++++++++- sys/arm64/linux/syscalls.master | 9 ++++++++- sys/i386/linux/syscalls.master | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index a6b8f262e02a..2c61a29a2a4e 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -2113,7 +2113,14 @@ int linux_process_madvise(void); } 441 AUE_NULL STD { - int linux_epoll_pwait2(void); + int linux_epoll_pwait2( + l_int epfd, + struct epoll_event *events, + l_int maxevents, + struct l_timespec *timeout, + l_sigset_t *mask, + l_size_t sigsetsize + ); } 442 AUE_NULL STD { int linux_mount_setattr(void); diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 4ba3a5fa67fd..6997dc9d0ae6 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -2515,7 +2515,14 @@ int linux_process_madvise(void); } 441 AUE_NULL STD { - int linux_epoll_pwait2(void); + int linux_epoll_pwait2_64( + l_int epfd, + struct epoll_event *events, + l_int maxevents, + struct l_timespec64 *timeout, + l_sigset_t *mask, + l_size_t sigsetsize + ); } 442 AUE_NULL STD { int linux_mount_setattr(void); diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 09d39ba87e3b..80271533527c 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -1762,7 +1762,14 @@ int linux_process_madvise(void); } 441 AUE_NULL STD { - int linux_epoll_pwait2(void); + int linux_epoll_pwait2( + l_int epfd, + struct epoll_event *events, + l_int maxevents, + struct l_timespec *timeout, + l_sigset_t *mask, + l_size_t sigsetsize + ); } 442 AUE_NULL STD { int linux_mount_setattr(void); diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index bcf6ac37d6dc..f68f22dedeb3 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -2533,7 +2533,14 @@ int linux_process_madvise(void); } 441 AUE_NULL STD { - int linux_epoll_pwait2(void); + int linux_epoll_pwait2_64( + l_int epfd, + struct epoll_event *events, + l_int maxevents, + struct l_timespec64 *timeout, + l_sigset_t *mask, + l_size_t sigsetsize + ); } 442 AUE_NULL STD { int linux_mount_setattr(void);