From nobody Sun May 8 10:38:40 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 80D4F1ABC074; Sun, 8 May 2022 10:38:40 +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 4Kx14J2Vtrz4bP7; Sun, 8 May 2022 10:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652006320; 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=bfinTC27IALcuUvNIImt4E7wIzf8nZcsOHaz011VSSs=; b=Th2DNembe3Eh1x4Ec0+6oAMDJZLfsJ9fMCCL1HpRy1x5ogsZs4tvFiH6QAh7V5/pLggOlp 8SCQQm8Ss4FoISwzNGKB6RjEwfzqhA5U12k/5wrote8xpYjwsiV+ValpOfEdGRwUFwGQru nHJs733jEjVA7AMwIMCS8x/8OCHdIJ3z+a7uNHiX6JQ+ZltXKAO4zY50jVSk7kyBRWM3lo M8Ax45TobX8v5kEHPMqeoqLM+peXc6wJcc8rtdzC8AiRn/fMUK67BVQoTx+2ET9hb3kme9 GJXa2IahOxn/tAkDSyPbLcc+k2FBVZbyq8oCEyw3kcWP5x0zZckitzFTkpaGNg== 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 332122321B; Sun, 8 May 2022 10:38:40 +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 248AcePL028208; Sun, 8 May 2022 10:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 248AcebC028207; Sun, 8 May 2022 10:38:40 GMT (envelope-from git) Date: Sun, 8 May 2022 10:38:40 GMT Message-Id: <202205081038.248AcebC028207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 61f45f6733d7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 61f45f6733d7536c442d14b30b435cfa6cd2f7cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652006320; 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=bfinTC27IALcuUvNIImt4E7wIzf8nZcsOHaz011VSSs=; b=Hf+LfGam2DrFmxEUHePFi4sx2vt7rdprGCUsDdpWgnt1jICkP84ATcU9TdTnwmbqEQXgO3 up6whtGaugQaFEe3OH2rC+MsbNI4UzruinUBCsaR2A79LAmth2RqhtSYzSBw9NdPLcBwWv yrMFdQfubuysCIB+7EtnqRyx4wgz0nkEz9oKrRCnEXZSRzvvi7W2i8VCop5NmTTBVwhgrb 31jYsA3X6GjPdyFIHYK4zr+T2a4/NYkoFpM9FHS4vjXfpq5YdPURu41pHkvBXtgfKQ7DRB HIWRZZZou1yDToc2LUye7DMiEE3N06RDNdP4VPRXwYAnoD3S5/Y9hI17yAZo9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652006320; a=rsa-sha256; cv=none; b=hQ6dp9FLvtujbYyFYsEq5yHDLUy5rIExNqp2kUybtICb0YhUBavm7icPaFijAOHCTAxqde /sUVADLFS81Ptfa0ICAXl5ZiDg19riHC3xC0RQn1jk2ZMe3RPpvtgCqryGUsX4yZtncwn3 AyxmTAo1NTtkwUXPyucDz/Pm0Hfg7AfwnOG350eJuWVELlzmKMcmAjnuzBoK9FJi0gyVpe 0dZgANlP/s+/WpyraRcnrdEAFh7DOpegr6McWqA0BSJyO2G4XwqIkoIVFXBMQReMcYDbBu pyNvoJAbuyJ9cGfI1E8Hkt7dFTojx8h1OxCNYLrfqiRAq57jkIP6ULatcDqAHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=61f45f6733d7536c442d14b30b435cfa6cd2f7cc commit 61f45f6733d7536c442d14b30b435cfa6cd2f7cc Author: Dmitry Chagin AuthorDate: 2022-05-08 10:38:17 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-08 10:38:17 +0000 linux(4): Regen for ppoll_time64 syscall. MFC after: 2 weeks --- 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 321391b38f1f..70d40d5f5767 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 651210c519c1..0e0c4ca7f9f0 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -3068,7 +3068,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_ppoll_time64_args *p = params; uarg[a++] = (intptr_t)p->fds; /* struct pollfd * */ uarg[a++] = p->nfds; /* uint32_t */ - uarg[a++] = (intptr_t)p->tsp; /* struct l_timespec * */ + uarg[a++] = (intptr_t)p->tsp; /* struct l_timespec64 * */ uarg[a++] = (intptr_t)p->sset; /* l_sigset_t * */ iarg[a++] = p->ssize; /* l_size_t */ *n_args = 5; @@ -8274,7 +8274,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 *";