d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux(4): Drop bogus __arm__ condition due to lack of 32-bit arm support

Browse Source 
MFC after:		1 month
This commit is contained in:
Dmitry Chagin 2023-08-17 22:57:17 +03:00
parent 4a521544a6
commit 6ecab39494
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/compat/linux/linux_socket.c
View File

@ -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) */

5
sys/compat/linux/linux_socket.h
View File

@ -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