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

linux(4): Deduplicate MI futex structures.

Browse Source 
MFC after:	1 week
This commit is contained in:
Dmitry Chagin 2023-02-01 21:57:04 +03:00
parent fd53298799
commit 575e48f1c4
6 changed files with 12 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/amd64/linux/linux.h
View File

@ -277,17 +277,6 @@ struct l_ifconf {
#define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r))
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_long futex_offset;
l_uintptr_t pending_list;
};
/* This corresponds to 'struct user_regs_struct' in Linux. */
struct linux_pt_regset {
l_ulong r15;

11
sys/amd64/linux32/linux.h
View File

@ -442,17 +442,6 @@ int linux32_copyinuio(struct l_iovec32 *iovp, l_ulong iovcnt,
int linux_copyout_rusage(struct rusage *ru, void *uaddr);
#endif /* _KERNEL */
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_long futex_offset;
l_uintptr_t pending_list;
};
/* This corresponds to 'struct user_regs_struct32' in Linux. */
struct linux_pt_regset32 {
l_uint ebx;

11
sys/arm64/linux/linux.h
View File

@ -217,17 +217,6 @@ struct l_ifreq {
#define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r))
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_long futex_offset;
l_uintptr_t pending_list;
};
struct linux_pt_regset {
l_ulong x[31];
l_ulong sp;

11
sys/compat/linux/linux_futex.h
View File

@ -79,6 +79,17 @@
#define FUTEX_TID_MASK 0x3fffffff
#define FUTEX_BITSET_MATCH_ANY 0xffffffff
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_long futex_offset;
l_uintptr_t pending_list;
};
int futex_xchgl(int oparg, uint32_t *uaddr, int *oldval);
int futex_addl(int oparg, uint32_t *uaddr, int *oldval);
int futex_orl(int oparg, uint32_t *uaddr, int *oldval);

11
sys/i386/linux/linux.h
View File

@ -395,15 +395,4 @@ struct l_desc_struct {
#define linux_copyout_rusage(r, u) copyout(r, u, sizeof(*r))
/* robust futexes */
struct linux_robust_list {
struct linux_robust_list *next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_long futex_offset;
struct linux_robust_list *pending_list;
};
#endif /* !_I386_LINUX_H_ */

1
sys/i386/linux/linux_copyout.c
View File

@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <machine/atomic.h>
#include <machine/md_var.h>
#include <i386/linux/linux.h>
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_futex.h>