From nobody Thu Aug 17 19:58:42 2023 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 4RRbRQ718dz4q55B; Thu, 17 Aug 2023 19:58:42 +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 4RRbRQ2rVdz4HVs; Thu, 17 Aug 2023 19:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302322; 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=BprTZLVZUBTM6O9BgI9C83m+FHeqUJ6Olg+PLIt90JM=; b=ulSAGFjltGtCzS2nZC+dTmw9+Ao4q1JlvV73USxZfZnTsWRRdVu4JYZ3NuXeOMF5O7L8Y4 ELUxBRXjuJDJ6zxvoViKm3yPY1kNEkobui0EvKO6N87j/nRr8ixQcvrboYS+3rMVPv3oXH 28eE00SAeKm3y00vw5yyk2QLvyyslN0nt9j0vflSiFWLL8o3sTQOuPsKRJzFT+1g+Hg28R wtfAST2CA2v0QM9d4SbRd4PF4oLb0/Zmf0nkoWNnN0zgN6DV1dtLvbmBDvgCco5ydUAuSO C1cUpfp//3hLk+Pbvnyd0IYq6nU+IA2nn3Ss+gXZeAtJIqGrpXu1zSImewDH5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302322; 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=BprTZLVZUBTM6O9BgI9C83m+FHeqUJ6Olg+PLIt90JM=; b=MJfdGIN8GKR+PB3q6qYd1pTerx5AxWuqK24XvtbzyB7bkhGbcCEclyyTZCafRKWIE/Lt/1 7XQLZR9IChV1PmRTGTAcApNX3t0yYqtRB3eP+KzUckzdnI9NNbc3J3SX/HNYUvyaSOGATZ qB3HI3KUntZkoX/rumx7T7sUNLpBSSL6WHaXU0tsvFavXgoG+7d9CfwUk3rEWjR5jODd0s dj1UJpCJuMq+XQlgkJ9+CrBHRw1a4lizRK9SrOOfy7EBGRG8vDOZ9sN1IG7NpbnzHDV1Nj zUTinyUxOfNlRIQangk7NVjObcAPobKZwSO3PqyXZDRQNO8M2rOBJDzfYONcpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302322; a=rsa-sha256; cv=none; b=P6gQf+PXDw1TNfN9AN8cfTcbvPfAlzGuEwz/6WGWS+0Xvoldrz8061yQ/X8qusDJQlMOtU 9TujEed2ZfE35ORTZjUimtdpNKwz8qlk11vO2Pivsi8Y4QDi8lFzWrOH1aqJna/obwSH0y Z9d6fzi1/LfG+IaPHlme7Ivk4rmiHf4C1m7SoFnTLrkJxcSgwUJaHtAguZeUrTOwnjuKeY 83i276JN3sc8QJZyiV511QN98XePJpdRTT2RZLSMro1oKyuKlfS3/ST25ElLkSPsRFuPCK C132DR/1lzQUckSN5B0csoZh4tpb4SNIn/tRxcgYoTA41HfGol4ZnbHyu/zaAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRbRQ1yWBznKN; Thu, 17 Aug 2023 19:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwg4W080544; Thu, 17 Aug 2023 19:58:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwgpj080541; Thu, 17 Aug 2023 19:58:42 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:42 GMT Message-Id: <202308171958.37HJwgpj080541@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: 6ecab3949493 - main - linux(4): Drop bogus __arm__ condition due to lack of 32-bit arm support 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: 6ecab3949493026b51d67b38fcd026a8bc64e69a Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6ecab3949493026b51d67b38fcd026a8bc64e69a commit 6ecab3949493026b51d67b38fcd026a8bc64e69a Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Drop bogus __arm__ condition due to lack of 32-bit arm support MFC after: 1 month --- sys/compat/linux/linux_socket.c | 9 +++------ sys/compat/linux/linux_socket.h | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 8def4dfaa665..eaccfab76eee 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2607,8 +2607,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) arg->offset != NULL ? &offset64 : NULL, arg->count); if (error == 0 && arg->offset != NULL) { -#if defined(__i386__) || defined(__arm__) || \ - (defined(__amd64__) && defined(COMPAT_LINUX32)) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) if (offset64 > INT32_MAX) return (EOVERFLOW); #endif @@ -2619,9 +2618,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) return (error); } -#if defined(__i386__) || defined(__arm__) || \ - (defined(__amd64__) && defined(COMPAT_LINUX32)) - +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) int linux_sendfile64(struct thread *td, struct linux_sendfile64_args *arg) { @@ -2731,4 +2728,4 @@ linux_socketcall(struct thread *td, struct linux_socketcall_args *args) linux_msg(td, "socket type %d not implemented", args->what); return (ENOSYS); } -#endif /* __i386__ || __arm__ || (__amd64__ && COMPAT_LINUX32) */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 2b4691bb9eca..68176c3cc401 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -124,8 +124,7 @@ struct l_ucred { uint32_t gid; }; -#if defined(__i386__) || defined(__arm__) || \ - (defined(__amd64__) && defined(COMPAT_LINUX32)) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) struct linux_accept_args { register_t s; @@ -158,7 +157,7 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_SENDMMSG 20 #define LINUX_SENDFILE 21 -#endif /* __i386__ || __arm__ || (__amd64__ && COMPAT_LINUX32) */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ /* Socket defines */ #define LINUX_SOL_SOCKET 1