From nobody Fri Jun 17 19:40:01 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 9D5BD85C9BF; Fri, 17 Jun 2022 19:40:03 +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 4LPqBV39wsz3h7R; Fri, 17 Jun 2022 19:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494803; 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=O+77ddjK62u95Gtxxx8hMzUApKCyRf7tbkLQ3oS3YQ4=; b=snqsySw18QU8HOz9V0egM9mN1+TCOYiVWa7PY9FjJdlaBqGhv1VBMXkkr0NmTRIfkEb+vR GP1UBBxtahJhwDKc/YV8jHYLSf5H5vdwoOl57jVQZ+3MAnkzXQH/JEBhbCOaqMpV4RT/Xb X2L5SHWwrzYBhJzUe3o/8DYq5OCrG4NxnnqQwCXpzSAOsAzRhA4jlWsy71mWm57TUBjOl9 Kc4gBY4NGzj1KvIY/XWVNcp/U4zBCbMDtuRuxlODthMpIPW0YtBnMp3YZHxQD0s0Ejnw2p 8POj3aYWPSBlAWikxW5tlTmhnBGjZevMpwUUapQ+DGjdcl/W/Zmde7+xcPviVA== 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 B607E257E5; Fri, 17 Jun 2022 19:40:01 +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 25HJe1d7018627; Fri, 17 Jun 2022 19:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJe1Wd018624; Fri, 17 Jun 2022 19:40:01 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:01 GMT Message-Id: <202206171940.25HJe1Wd018624@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: fe35736d0bb1 - stable/13 - linux(4): Regen for ppoll_time64 syscall. 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: fe35736d0bb157977af4f5886d8383b5b95b6a66 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494803; 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=O+77ddjK62u95Gtxxx8hMzUApKCyRf7tbkLQ3oS3YQ4=; b=lXBLr1xUupk+enufb7fLo6yz06ykqYMUS15Y+iwU+cpxQLuBZwPkq/AXUSgdf+SoPMoCkb DLqT1hQS5ifiPgDDeJDawg12+NhDKhd00ggBVunmF7qzWbhXUqeDmEmZV7w9UFoE0nfCPq eheg0t10CAu4+HfTBD3uvMss4+I2oWKAGgzIrwu0k+7hxAaTBr9XmzcJF6G6A/WcPBBQTJ fM8QRTRtOfBq1R4dxbAZL3ve7Lbo3uhX9EuZUFKchGXXskv8ig0C7K851QfestWbNs4SgO RRyPJqv/d9t5VxvYqPx2f2beG8T77w1MCW4Nzxm8EnYfJy+6ubP0murF4Q4PoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494803; a=rsa-sha256; cv=none; b=SZvoSZwuRvQN4LBV4jr5o3aBWNot+4agXT8oNdNrcNB5XgxhZVTLxE7AV39D2XysgC+Oxi rl+WpKcSlbKT8Fy2gVDjAZuEQ1bX4Bxkuvj6LfwcqkfUruYCj64InyBqQnqnWgw46kb5tb +9vcYmPVd3RmikllnhIHIJ4OAQDsIuRgCbSXmszT9n437U02tw8Q7zatsdtDCgZ9Scd43t PlhuJQPiAX3rqIG5f0KwflzOoznteorQh/dOStaqIejnsqutw5gL5ccjoO06TPN9ZcVYWU /suAz8m9Ab16mopqOWXjc7iLMt2uiMwXUF2LUHImfpFEh4X7CgSBlL9meRG+Jg== 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=fe35736d0bb157977af4f5886d8383b5b95b6a66 commit fe35736d0bb157977af4f5886d8383b5b95b6a66 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:34:58 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:34:58 +0000 linux(4): Regen for ppoll_time64 syscall. MFC after: 2 weeks (cherry picked from commit 61f45f6733d7536c442d14b30b435cfa6cd2f7cc) --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 6d366ae9137b..a631088b7d23 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -1584,7 +1584,7 @@ struct linux_pselect6_time64_args { struct linux_ppoll_time64_args { char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)]; char nfds_l_[PADL_(uint32_t)]; uint32_t nfds; char nfds_r_[PADR_(uint32_t)]; - char tsp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tsp; char tsp_r_[PADR_(struct l_timespec *)]; + char tsp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tsp; char tsp_r_[PADR_(struct l_timespec64 *)]; char sset_l_[PADL_(l_sigset_t *)]; l_sigset_t * sset; char sset_r_[PADR_(l_sigset_t *)]; char ssize_l_[PADL_(l_size_t)]; l_size_t ssize; char ssize_r_[PADR_(l_size_t)]; }; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 009716bbc29f..a13b468ac296 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3067,7 +3067,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_ppoll_time64_args *p = params; uarg[0] = (intptr_t)p->fds; /* struct pollfd * */ uarg[1] = p->nfds; /* uint32_t */ - uarg[2] = (intptr_t)p->tsp; /* struct l_timespec * */ + uarg[2] = (intptr_t)p->tsp; /* struct l_timespec64 * */ uarg[3] = (intptr_t)p->sset; /* l_sigset_t * */ iarg[4] = p->ssize; /* l_size_t */ *n_args = 5; @@ -8273,7 +8273,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "uint32_t"; break; case 2: - p = "userland struct l_timespec *"; + p = "userland struct l_timespec64 *"; break; case 3: p = "userland l_sigset_t *";