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

freebsd32: add a union semun_old32

Browse Source 
Use this for COMPAT7 support.  In practice it's the same as
union semun32 since the pointers become uint32_t's the it's more
symetric and is the logical thing to generate from semun_old.

Reviewed by:	kevans
This commit is contained in:
Brooks Davis 2021-11-17 20:12:23 +00:00
parent 6dcd7db176
commit e5b0997650
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/freebsd32/freebsd32_ipc.h
View File

@ -181,6 +181,12 @@ struct shmid_ds32_old {
uint32_t shm_internal;
};
union semun_old32 {
int val;
uint32_t buf;
uint32_t array;
};
void freebsd32_ipcperm_old_in(struct ipc_perm32_old *ip32,
struct ipc_perm *ip);
void freebsd32_ipcperm_old_out(struct ipc_perm *ip,

2
sys/compat/freebsd32/freebsd32_proto.h
View File

@ -1171,7 +1171,7 @@ struct freebsd7_freebsd32_semctl_args {
char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
char arg_l_[PADL_(union semun32 *)]; union semun32 * arg; char arg_r_[PADR_(union semun32 *)];
char arg_l_[PADL_(union semun_old32 *)]; union semun_old32 * arg; char arg_r_[PADR_(union semun_old32 *)];
};
struct freebsd7_freebsd32_msgctl_args {
char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];

2
sys/compat/freebsd32/syscalls.master
View File

@ -420,7 +420,7 @@
220 AUE_SEMCTL COMPAT7|NOSTD { int freebsd32_semctl( \
int semid, int semnum, \
int cmd, union semun32 *arg); }
int cmd, union semun_old32 *arg); }
221 AUE_SEMGET NOSTD|NOPROTO { int semget(key_t key, int nsems, \
int semflg); }
222 AUE_SEMOP NOSTD|NOPROTO { int semop(int semid, \

2
sys/kern/sysv_sem.c
View File

@ -1870,7 +1870,7 @@ freebsd7_freebsd32_semctl(struct thread *td,
struct semid_ds32_old dsbuf32;
struct semid_ds dsbuf;
union semun semun;
union semun32 arg;
union semun_old32 arg;
register_t rval;
int error;