Page MenuHomeFreeBSD
Files F154616542

D1068.id5628.diff
No OneTemporary
Actions

D1068.id5628.diff
View Options

Index: head/sys/amd64/linux32/linux.h
===================================================================
--- head/sys/amd64/linux32/linux.h
+++ head/sys/amd64/linux32/linux.h
@@ -573,6 +573,16 @@
l_uintptr_t __pad;
} __packed;
+struct l_ipc_perm {
+ l_key_t key;
+ l_uid16_t uid;
+ l_gid16_t gid;
+ l_uid16_t cuid;
+ l_gid16_t cgid;
+ l_ushort mode;
+ l_ushort seq;
+};
+
/*
* Socket defines
*/
Index: head/sys/compat/linux/linux_ipc.h
===================================================================
--- head/sys/compat/linux/linux_ipc.h
+++ head/sys/compat/linux/linux_ipc.h
@@ -82,7 +82,7 @@
#define LINUX_IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger
message sizes, etc. */
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32))
struct linux_msgctl_args
{
@@ -177,6 +177,6 @@
int linux_shmdt(struct thread *, struct linux_shmdt_args *);
int linux_shmget(struct thread *, struct linux_shmget_args *);
-#endif /* __i386__ || __amd64__ */
+#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */
#endif /* _LINUX_IPC_H_ */
Index: head/sys/compat/linux/linux_ipc.c
===================================================================
--- head/sys/compat/linux/linux_ipc.c
+++ head/sys/compat/linux/linux_ipc.c
@@ -117,16 +117,6 @@
lpp->swap_successes = bpp->swap_successes ;
}
-struct l_ipc_perm {
- l_key_t key;
- l_uid16_t uid;
- l_gid16_t gid;
- l_uid16_t cuid;
- l_gid16_t cgid;
- l_ushort mode;
- l_ushort seq;
-};
-
static void
linux_to_bsd_ipc_perm(struct l_ipc_perm *lpp, struct ipc_perm *bpp)
{
Index: head/sys/i386/linux/linux.h
===================================================================
--- head/sys/i386/linux/linux.h
+++ head/sys/i386/linux/linux.h
@@ -550,6 +550,16 @@
void *__pad;
};
+struct l_ipc_perm {
+ l_key_t key;
+ l_uid16_t uid;
+ l_gid16_t gid;
+ l_uid16_t cuid;
+ l_gid16_t cgid;
+ l_ushort mode;
+ l_ushort seq;
+};
+
/*
* Socket defines
*/

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 1:26 AM (5 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32427732
Default Alt Text
D1068.id5628.diff (1 KB)

Event Timeline