The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6ecab3949493026b51d67b38fcd026a8bc64e69a
commit 6ecab3949493026b51d67b38fcd026a8bc64e69a Author: Dmitry Chagin <[email protected]> AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin <[email protected]> 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
