svn commit: r196009 - in stable/7/sys: compat/freebsd32 kern sys
John Baldwin
jhb at FreeBSD.org
Sat Aug 1 01:54:44 UTC 2009
Author: jhb
Date: Sat Aug 1 01:54:42 2009
New Revision: 196009
URL: http://svn.freebsd.org/changeset/base/196009
Log:
Regen.
Modified:
stable/7/sys/compat/freebsd32/freebsd32_proto.h
stable/7/sys/compat/freebsd32/freebsd32_syscall.h
stable/7/sys/compat/freebsd32/freebsd32_syscalls.c
stable/7/sys/compat/freebsd32/freebsd32_sysent.c
stable/7/sys/kern/init_sysent.c
stable/7/sys/kern/syscalls.c
stable/7/sys/kern/systrace_args.c
stable/7/sys/sys/syscall.h
stable/7/sys/sys/syscall.mk
stable/7/sys/sys/sysproto.h
Modified: stable/7/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- stable/7/sys/compat/freebsd32/freebsd32_proto.h Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/compat/freebsd32/freebsd32_proto.h Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -170,16 +170,16 @@ struct freebsd32_futimes_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)];
};
-struct freebsd32_semctl_args {
+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 *)];
};
-struct freebsd32_msgctl_args {
+struct freebsd7_freebsd32_msgctl_args {
char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char buf_l_[PADL_(struct msqid_ds32 *)]; struct msqid_ds32 * buf; char buf_r_[PADR_(struct msqid_ds32 *)];
+ char buf_l_[PADL_(struct msqid_ds32_old *)]; struct msqid_ds32_old * buf; char buf_r_[PADR_(struct msqid_ds32_old *)];
};
struct freebsd32_msgsnd_args {
char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
@@ -194,10 +194,10 @@ struct freebsd32_msgrcv_args {
char msgtyp_l_[PADL_(long)]; long msgtyp; char msgtyp_r_[PADR_(long)];
char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)];
};
-struct freebsd32_shmctl_args {
+struct freebsd7_freebsd32_shmctl_args {
char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char buf_l_[PADL_(struct shmid_ds *)]; struct shmid_ds * buf; char buf_r_[PADR_(struct shmid_ds *)];
+ char buf_l_[PADL_(struct shmid_ds32_old *)]; struct shmid_ds32_old * buf; char buf_r_[PADR_(struct shmid_ds32_old *)];
};
struct freebsd32_clock_gettime_args {
char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
@@ -423,6 +423,22 @@ struct freebsd32_cpuset_setaffinity_args
char cpusetsize_l_[PADL_(size_t)]; size_t cpusetsize; char cpusetsize_r_[PADR_(size_t)];
char mask_l_[PADL_(const cpuset_t *)]; const cpuset_t * mask; char mask_r_[PADR_(const cpuset_t *)];
};
+struct 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 *)];
+};
+struct freebsd32_msgctl_args {
+ char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char buf_l_[PADL_(struct msqid_ds32 *)]; struct msqid_ds32 * buf; char buf_r_[PADR_(struct msqid_ds32 *)];
+};
+struct freebsd32_shmctl_args {
+ char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char buf_l_[PADL_(struct shmid_ds32 *)]; struct shmid_ds32 * buf; char buf_r_[PADR_(struct shmid_ds32 *)];
+};
int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *);
int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *);
int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *);
@@ -449,11 +465,11 @@ int freebsd32_lstat(struct thread *, str
int freebsd32_getdirentries(struct thread *, struct freebsd32_getdirentries_args *);
int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
-int freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *);
-int freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
+int freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_args *);
+int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *);
int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *);
int freebsd32_msgrcv(struct thread *, struct freebsd32_msgrcv_args *);
-int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
+int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *);
int freebsd32_clock_gettime(struct thread *, struct freebsd32_clock_gettime_args *);
int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *);
int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *);
@@ -500,6 +516,9 @@ int freebsd32_cpuset_setid(struct thread
int freebsd32_cpuset_getid(struct thread *, struct freebsd32_cpuset_getid_args *);
int freebsd32_cpuset_getaffinity(struct thread *, struct freebsd32_cpuset_getaffinity_args *);
int freebsd32_cpuset_setaffinity(struct thread *, struct freebsd32_cpuset_setaffinity_args *);
+int freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *);
+int freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
+int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
#ifdef COMPAT_43
@@ -689,11 +708,11 @@ int freebsd6_freebsd32_ftruncate(struct
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_ftruncate AUE_FTRUNCATE
#define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL
#define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES
-#define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL
-#define FREEBSD32_SYS_AUE_freebsd32_msgctl AUE_MSGCTL
+#define FREEBSD32_SYS_AUE_freebsd7_freebsd32_semctl AUE_SEMCTL
+#define FREEBSD32_SYS_AUE_freebsd7_freebsd32_msgctl AUE_MSGCTL
#define FREEBSD32_SYS_AUE_freebsd32_msgsnd AUE_MSGSND
#define FREEBSD32_SYS_AUE_freebsd32_msgrcv AUE_MSGRCV
-#define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL
+#define FREEBSD32_SYS_AUE_freebsd7_freebsd32_shmctl AUE_SHMCTL
#define FREEBSD32_SYS_AUE_freebsd32_clock_gettime AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME
#define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL
@@ -744,6 +763,9 @@ int freebsd6_freebsd32_ftruncate(struct
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getid AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getaffinity AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setaffinity AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL
+#define FREEBSD32_SYS_AUE_freebsd32_msgctl AUE_MSGCTL
+#define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL
#undef PAD_
#undef PADL_
Modified: stable/7/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- stable/7/sys/compat/freebsd32/freebsd32_syscall.h Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/compat/freebsd32/freebsd32_syscall.h Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
#define FREEBSD32_SYS_syscall 0
@@ -190,15 +190,15 @@
#define FREEBSD32_SYS_freebsd32_futimes 206
#define FREEBSD32_SYS_getpgid 207
#define FREEBSD32_SYS_poll 209
-#define FREEBSD32_SYS_freebsd32_semctl 220
+#define FREEBSD32_SYS_freebsd7_freebsd32_semctl 220
#define FREEBSD32_SYS_semget 221
#define FREEBSD32_SYS_semop 222
-#define FREEBSD32_SYS_freebsd32_msgctl 224
+#define FREEBSD32_SYS_freebsd7_freebsd32_msgctl 224
#define FREEBSD32_SYS_msgget 225
#define FREEBSD32_SYS_freebsd32_msgsnd 226
#define FREEBSD32_SYS_freebsd32_msgrcv 227
#define FREEBSD32_SYS_shmat 228
-#define FREEBSD32_SYS_freebsd32_shmctl 229
+#define FREEBSD32_SYS_freebsd7_freebsd32_shmctl 229
#define FREEBSD32_SYS_shmdt 230
#define FREEBSD32_SYS_shmget 231
#define FREEBSD32_SYS_freebsd32_clock_gettime 232
@@ -362,4 +362,7 @@
#define FREEBSD32_SYS_freebsd32_cpuset_getaffinity 487
#define FREEBSD32_SYS_freebsd32_cpuset_setaffinity 488
#define FREEBSD32_SYS_closefrom 509
-#define FREEBSD32_SYS_MAXSYSCALL 510
+#define FREEBSD32_SYS_freebsd32_semctl 510
+#define FREEBSD32_SYS_freebsd32_msgctl 511
+#define FREEBSD32_SYS_freebsd32_shmctl 512
+#define FREEBSD32_SYS_MAXSYSCALL 513
Modified: stable/7/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- stable/7/sys/compat/freebsd32/freebsd32_syscalls.c Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/compat/freebsd32/freebsd32_syscalls.c Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
const char *freebsd32_syscallnames[] = {
@@ -227,16 +227,16 @@ const char *freebsd32_syscallnames[] = {
"lkmnosys", /* 217 = lkmnosys */
"lkmnosys", /* 218 = lkmnosys */
"lkmnosys", /* 219 = lkmnosys */
- "freebsd32_semctl", /* 220 = freebsd32_semctl */
+ "freebsd7_freebsd32_semctl", /* 220 = freebsd7_freebsd32_semctl */
"semget", /* 221 = semget */
"semop", /* 222 = semop */
"#223", /* 223 = semconfig */
- "freebsd32_msgctl", /* 224 = freebsd32_msgctl */
+ "freebsd7_freebsd32_msgctl", /* 224 = freebsd7_freebsd32_msgctl */
"msgget", /* 225 = msgget */
"freebsd32_msgsnd", /* 226 = freebsd32_msgsnd */
"freebsd32_msgrcv", /* 227 = freebsd32_msgrcv */
"shmat", /* 228 = shmat */
- "freebsd32_shmctl", /* 229 = freebsd32_shmctl */
+ "freebsd7_freebsd32_shmctl", /* 229 = freebsd7_freebsd32_shmctl */
"shmdt", /* 230 = shmdt */
"shmget", /* 231 = shmget */
"freebsd32_clock_gettime", /* 232 = freebsd32_clock_gettime */
@@ -517,4 +517,7 @@ const char *freebsd32_syscallnames[] = {
"#507", /* 507 = freebsd32_jail_set */
"#508", /* 508 = jail_remove */
"closefrom", /* 509 = closefrom */
+ "freebsd32_semctl", /* 510 = freebsd32_semctl */
+ "freebsd32_msgctl", /* 511 = freebsd32_msgctl */
+ "freebsd32_shmctl", /* 512 = freebsd32_shmctl */
};
Modified: stable/7/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- stable/7/sys/compat/freebsd32/freebsd32_sysent.c Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/compat/freebsd32/freebsd32_sysent.c Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/compat/freebsd32/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
#include "opt_compat.h"
@@ -258,16 +258,16 @@ struct sysent freebsd32_sysent[] = {
{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */
{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */
{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */
- { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */
+ { AS(freebsd7_freebsd32_semctl_args), (sy_call_t *)freebsd7_freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd7_freebsd32_semctl */
{ AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */
{ AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = semconfig */
- { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0 }, /* 224 = freebsd32_msgctl */
+ { AS(freebsd7_freebsd32_msgctl_args), (sy_call_t *)freebsd7_freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0 }, /* 224 = freebsd7_freebsd32_msgctl */
{ AS(msgget_args), (sy_call_t *)msgget, AUE_MSGGET, NULL, 0, 0 }, /* 225 = msgget */
{ AS(freebsd32_msgsnd_args), (sy_call_t *)freebsd32_msgsnd, AUE_MSGSND, NULL, 0, 0 }, /* 226 = freebsd32_msgsnd */
{ AS(freebsd32_msgrcv_args), (sy_call_t *)freebsd32_msgrcv, AUE_MSGRCV, NULL, 0, 0 }, /* 227 = freebsd32_msgrcv */
{ AS(shmat_args), (sy_call_t *)shmat, AUE_SHMAT, NULL, 0, 0 }, /* 228 = shmat */
- { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0 }, /* 229 = freebsd32_shmctl */
+ { AS(freebsd7_freebsd32_shmctl_args), (sy_call_t *)freebsd7_freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0 }, /* 229 = freebsd7_freebsd32_shmctl */
{ AS(shmdt_args), (sy_call_t *)shmdt, AUE_SHMDT, NULL, 0, 0 }, /* 230 = shmdt */
{ AS(shmget_args), (sy_call_t *)shmget, AUE_SHMGET, NULL, 0, 0 }, /* 231 = shmget */
{ AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 232 = freebsd32_clock_gettime */
@@ -548,4 +548,7 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 507 = freebsd32_jail_set */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 508 = jail_remove */
{ AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0 }, /* 509 = closefrom */
+ { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 510 = freebsd32_semctl */
+ { AS(freebsd32_msgctl_args), (sy_call_t *)freebsd32_msgctl, AUE_MSGCTL, NULL, 0, 0 }, /* 511 = freebsd32_msgctl */
+ { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL, NULL, 0, 0 }, /* 512 = freebsd32_shmctl */
};
Modified: stable/7/sys/kern/init_sysent.c
==============================================================================
--- stable/7/sys/kern/init_sysent.c Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/kern/init_sysent.c Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/kern/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/kern/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
#include "opt_compat.h"
@@ -248,16 +248,16 @@ struct sysent sysent[] = {
{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */
{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */
{ AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */
- { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 220 = __semctl */
+ { AS(freebsd7___semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 220 = freebsd7___semctl */
{ AS(semget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 221 = semget */
{ AS(semop_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 222 = semop */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = semconfig */
- { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 224 = msgctl */
+ { AS(freebsd7_msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 224 = freebsd7_msgctl */
{ AS(msgget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 225 = msgget */
{ AS(msgsnd_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 226 = msgsnd */
{ AS(msgrcv_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 227 = msgrcv */
{ AS(shmat_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 228 = shmat */
- { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 229 = shmctl */
+ { AS(freebsd7_shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 229 = freebsd7_shmctl */
{ AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 230 = shmdt */
{ AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 231 = shmget */
{ AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 232 = clock_gettime */
@@ -538,4 +538,7 @@ struct sysent sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 507 = jail_set */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 508 = jail_remove */
{ AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0 }, /* 509 = closefrom */
+ { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 510 = __semctl */
+ { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 511 = msgctl */
+ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 512 = shmctl */
};
Modified: stable/7/sys/kern/syscalls.c
==============================================================================
--- stable/7/sys/kern/syscalls.c Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/kern/syscalls.c Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/kern/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/kern/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
const char *syscallnames[] = {
@@ -227,16 +227,16 @@ const char *syscallnames[] = {
"lkmnosys", /* 217 = lkmnosys */
"lkmnosys", /* 218 = lkmnosys */
"lkmnosys", /* 219 = lkmnosys */
- "__semctl", /* 220 = __semctl */
+ "freebsd7___semctl", /* 220 = freebsd7___semctl */
"semget", /* 221 = semget */
"semop", /* 222 = semop */
"#223", /* 223 = semconfig */
- "msgctl", /* 224 = msgctl */
+ "freebsd7_msgctl", /* 224 = freebsd7_msgctl */
"msgget", /* 225 = msgget */
"msgsnd", /* 226 = msgsnd */
"msgrcv", /* 227 = msgrcv */
"shmat", /* 228 = shmat */
- "shmctl", /* 229 = shmctl */
+ "freebsd7_shmctl", /* 229 = freebsd7_shmctl */
"shmdt", /* 230 = shmdt */
"shmget", /* 231 = shmget */
"clock_gettime", /* 232 = clock_gettime */
@@ -517,4 +517,7 @@ const char *syscallnames[] = {
"#507", /* 507 = jail_set */
"#508", /* 508 = jail_remove */
"closefrom", /* 509 = closefrom */
+ "__semctl", /* 510 = __semctl */
+ "msgctl", /* 511 = msgctl */
+ "shmctl", /* 512 = shmctl */
};
Modified: stable/7/sys/kern/systrace_args.c
==============================================================================
--- stable/7/sys/kern/systrace_args.c Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/kern/systrace_args.c Sat Aug 1 01:54:42 2009 (r196009)
@@ -1215,13 +1215,13 @@ systrace_args(int sysnum, void *params,
*n_args = 0;
break;
}
- /* __semctl */
+ /* freebsd7___semctl */
case 220: {
- struct __semctl_args *p = params;
+ struct freebsd7___semctl_args *p = params;
iarg[0] = p->semid; /* int */
iarg[1] = p->semnum; /* int */
iarg[2] = p->cmd; /* int */
- uarg[3] = (intptr_t) p->arg; /* union semun * */
+ uarg[3] = (intptr_t) p->arg; /* union semun_old * */
*n_args = 4;
break;
}
@@ -1243,12 +1243,12 @@ systrace_args(int sysnum, void *params,
*n_args = 3;
break;
}
- /* msgctl */
+ /* freebsd7_msgctl */
case 224: {
- struct msgctl_args *p = params;
+ struct freebsd7_msgctl_args *p = params;
iarg[0] = p->msqid; /* int */
iarg[1] = p->cmd; /* int */
- uarg[2] = (intptr_t) p->buf; /* struct msqid_ds * */
+ uarg[2] = (intptr_t) p->buf; /* struct msqid_ds_old * */
*n_args = 3;
break;
}
@@ -1290,12 +1290,12 @@ systrace_args(int sysnum, void *params,
*n_args = 3;
break;
}
- /* shmctl */
+ /* freebsd7_shmctl */
case 229: {
- struct shmctl_args *p = params;
+ struct freebsd7_shmctl_args *p = params;
iarg[0] = p->shmid; /* int */
iarg[1] = p->cmd; /* int */
- uarg[2] = (intptr_t) p->buf; /* struct shmid_ds * */
+ uarg[2] = (intptr_t) p->buf; /* struct shmid_ds_old * */
*n_args = 3;
break;
}
@@ -2930,6 +2930,34 @@ systrace_args(int sysnum, void *params,
*n_args = 1;
break;
}
+ /* __semctl */
+ case 510: {
+ struct __semctl_args *p = params;
+ iarg[0] = p->semid; /* int */
+ iarg[1] = p->semnum; /* int */
+ iarg[2] = p->cmd; /* int */
+ uarg[3] = (intptr_t) p->arg; /* union semun * */
+ *n_args = 4;
+ break;
+ }
+ /* msgctl */
+ case 511: {
+ struct msgctl_args *p = params;
+ iarg[0] = p->msqid; /* int */
+ iarg[1] = p->cmd; /* int */
+ uarg[2] = (intptr_t) p->buf; /* struct msqid_ds * */
+ *n_args = 3;
+ break;
+ }
+ /* shmctl */
+ case 512: {
+ struct shmctl_args *p = params;
+ iarg[0] = p->shmid; /* int */
+ iarg[1] = p->cmd; /* int */
+ uarg[2] = (intptr_t) p->buf; /* struct shmid_ds * */
+ *n_args = 3;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -4855,7 +4883,7 @@ systrace_setargdesc(int sysnum, int ndx,
/* lkmnosys */
case 219:
break;
- /* __semctl */
+ /* freebsd7___semctl */
case 220:
switch(ndx) {
case 0:
@@ -4868,7 +4896,7 @@ systrace_setargdesc(int sysnum, int ndx,
p = "int";
break;
case 3:
- p = "union semun *";
+ p = "union semun_old *";
break;
default:
break;
@@ -4906,7 +4934,7 @@ systrace_setargdesc(int sysnum, int ndx,
break;
};
break;
- /* msgctl */
+ /* freebsd7_msgctl */
case 224:
switch(ndx) {
case 0:
@@ -4916,7 +4944,7 @@ systrace_setargdesc(int sysnum, int ndx,
p = "int";
break;
case 2:
- p = "struct msqid_ds *";
+ p = "struct msqid_ds_old *";
break;
default:
break;
@@ -4992,7 +5020,7 @@ systrace_setargdesc(int sysnum, int ndx,
break;
};
break;
- /* shmctl */
+ /* freebsd7_shmctl */
case 229:
switch(ndx) {
case 0:
@@ -5002,7 +5030,7 @@ systrace_setargdesc(int sysnum, int ndx,
p = "int";
break;
case 2:
- p = "struct shmid_ds *";
+ p = "struct shmid_ds_old *";
break;
default:
break;
@@ -7739,6 +7767,57 @@ systrace_setargdesc(int sysnum, int ndx,
break;
};
break;
+ /* __semctl */
+ case 510:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "int";
+ break;
+ case 3:
+ p = "union semun *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* msgctl */
+ case 511:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "struct msqid_ds *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* shmctl */
+ case 512:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "struct shmid_ds *";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
Modified: stable/7/sys/sys/syscall.h
==============================================================================
--- stable/7/sys/sys/syscall.h Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/sys/syscall.h Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/kern/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/kern/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
#define SYS_syscall 0
@@ -196,15 +196,15 @@
#define SYS_futimes 206
#define SYS_getpgid 207
#define SYS_poll 209
-#define SYS___semctl 220
+#define SYS_freebsd7___semctl 220
#define SYS_semget 221
#define SYS_semop 222
-#define SYS_msgctl 224
+#define SYS_freebsd7_msgctl 224
#define SYS_msgget 225
#define SYS_msgsnd 226
#define SYS_msgrcv 227
#define SYS_shmat 228
-#define SYS_shmctl 229
+#define SYS_freebsd7_shmctl 229
#define SYS_shmdt 230
#define SYS_shmget 231
#define SYS_clock_gettime 232
@@ -408,4 +408,7 @@
#define SYS_cpuset_getaffinity 487
#define SYS_cpuset_setaffinity 488
#define SYS_closefrom 509
-#define SYS_MAXSYSCALL 510
+#define SYS___semctl 510
+#define SYS_msgctl 511
+#define SYS_shmctl 512
+#define SYS_MAXSYSCALL 513
Modified: stable/7/sys/sys/syscall.mk
==============================================================================
--- stable/7/sys/sys/syscall.mk Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/sys/syscall.mk Sat Aug 1 01:54:42 2009 (r196009)
@@ -1,7 +1,7 @@
# FreeBSD system call names.
# DO NOT EDIT-- this file is automatically generated.
# $FreeBSD$
-# created from FreeBSD: stable/7/sys/kern/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+# created from FreeBSD: stable/7/sys/kern/syscalls.master 196006 2009-07-31 20:32:55Z jhb
MIASM = \
syscall.o \
exit.o \
@@ -148,15 +148,15 @@ MIASM = \
futimes.o \
getpgid.o \
poll.o \
- __semctl.o \
+ freebsd7___semctl.o \
semget.o \
semop.o \
- msgctl.o \
+ freebsd7_msgctl.o \
msgget.o \
msgsnd.o \
msgrcv.o \
shmat.o \
- shmctl.o \
+ freebsd7_shmctl.o \
shmdt.o \
shmget.o \
clock_gettime.o \
@@ -356,4 +356,7 @@ MIASM = \
cpuset_getid.o \
cpuset_getaffinity.o \
cpuset_setaffinity.o \
- closefrom.o
+ closefrom.o \
+ __semctl.o \
+ msgctl.o \
+ shmctl.o
Modified: stable/7/sys/sys/sysproto.h
==============================================================================
--- stable/7/sys/sys/sysproto.h Sat Aug 1 01:04:26 2009 (r196008)
+++ stable/7/sys/sys/sysproto.h Sat Aug 1 01:54:42 2009 (r196009)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/7/sys/kern/syscalls.master 195854 2009-07-24 19:35:06Z jhb
+ * created from FreeBSD: stable/7/sys/kern/syscalls.master 196006 2009-07-31 20:32:55Z jhb
*/
#ifndef _SYS_SYSPROTO_H_
@@ -660,11 +660,11 @@ struct poll_args {
char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)];
};
-struct __semctl_args {
+struct freebsd7___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 semun *)]; union semun * arg; char arg_r_[PADR_(union semun *)];
+ char arg_l_[PADL_(union semun_old *)]; union semun_old * arg; char arg_r_[PADR_(union semun_old *)];
};
struct semget_args {
char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)];
@@ -676,10 +676,10 @@ struct semop_args {
char sops_l_[PADL_(struct sembuf *)]; struct sembuf * sops; char sops_r_[PADR_(struct sembuf *)];
char nsops_l_[PADL_(size_t)]; size_t nsops; char nsops_r_[PADR_(size_t)];
};
-struct msgctl_args {
+struct freebsd7_msgctl_args {
char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char buf_l_[PADL_(struct msqid_ds *)]; struct msqid_ds * buf; char buf_r_[PADR_(struct msqid_ds *)];
+ char buf_l_[PADL_(struct msqid_ds_old *)]; struct msqid_ds_old * buf; char buf_r_[PADR_(struct msqid_ds_old *)];
};
struct msgget_args {
char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)];
@@ -703,10 +703,10 @@ struct shmat_args {
char shmaddr_l_[PADL_(const void *)]; const void * shmaddr; char shmaddr_r_[PADR_(const void *)];
char shmflg_l_[PADL_(int)]; int shmflg; char shmflg_r_[PADR_(int)];
};
-struct shmctl_args {
+struct freebsd7_shmctl_args {
char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char buf_l_[PADL_(struct shmid_ds *)]; struct shmid_ds * buf; char buf_r_[PADR_(struct shmid_ds *)];
+ char buf_l_[PADL_(struct shmid_ds_old *)]; struct shmid_ds_old * buf; char buf_r_[PADR_(struct shmid_ds_old *)];
};
struct shmdt_args {
char shmaddr_l_[PADL_(const void *)]; const void * shmaddr; char shmaddr_r_[PADR_(const void *)];
@@ -1557,6 +1557,22 @@ struct cpuset_setaffinity_args {
struct closefrom_args {
char lowfd_l_[PADL_(int)]; int lowfd; char lowfd_r_[PADR_(int)];
};
+struct __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 semun *)]; union semun * arg; char arg_r_[PADR_(union semun *)];
+};
+struct msgctl_args {
+ char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char buf_l_[PADL_(struct msqid_ds *)]; struct msqid_ds * buf; char buf_r_[PADR_(struct msqid_ds *)];
+};
+struct shmctl_args {
+ char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
+ char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
+ char buf_l_[PADL_(struct shmid_ds *)]; struct shmid_ds * buf; char buf_r_[PADR_(struct shmid_ds *)];
+};
int nosys(struct thread *, struct nosys_args *);
void sys_exit(struct thread *, struct sys_exit_args *);
int fork(struct thread *, struct fork_args *);
@@ -1698,15 +1714,15 @@ int undelete(struct thread *, struct und
int futimes(struct thread *, struct futimes_args *);
int getpgid(struct thread *, struct getpgid_args *);
int poll(struct thread *, struct poll_args *);
-int __semctl(struct thread *, struct __semctl_args *);
+int freebsd7___semctl(struct thread *, struct freebsd7___semctl_args *);
int semget(struct thread *, struct semget_args *);
int semop(struct thread *, struct semop_args *);
-int msgctl(struct thread *, struct msgctl_args *);
+int freebsd7_msgctl(struct thread *, struct freebsd7_msgctl_args *);
int msgget(struct thread *, struct msgget_args *);
int msgsnd(struct thread *, struct msgsnd_args *);
int msgrcv(struct thread *, struct msgrcv_args *);
int shmat(struct thread *, struct shmat_args *);
-int shmctl(struct thread *, struct shmctl_args *);
+int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *);
int shmdt(struct thread *, struct shmdt_args *);
int shmget(struct thread *, struct shmget_args *);
int clock_gettime(struct thread *, struct clock_gettime_args *);
@@ -1901,6 +1917,9 @@ int cpuset_getid(struct thread *, struct
int cpuset_getaffinity(struct thread *, struct cpuset_getaffinity_args *);
int cpuset_setaffinity(struct thread *, struct cpuset_setaffinity_args *);
int closefrom(struct thread *, struct closefrom_args *);
+int __semctl(struct thread *, struct __semctl_args *);
+int msgctl(struct thread *, struct msgctl_args *);
+int shmctl(struct thread *, struct shmctl_args *);
#ifdef COMPAT_43
@@ -2307,15 +2326,15 @@ int freebsd4_sigreturn(struct thread *,
#define SYS_AUE_futimes AUE_FUTIMES
#define SYS_AUE_getpgid AUE_GETPGID
#define SYS_AUE_poll AUE_POLL
-#define SYS_AUE___semctl AUE_SEMCTL
+#define SYS_AUE_freebsd7___semctl AUE_SEMCTL
#define SYS_AUE_semget AUE_SEMGET
#define SYS_AUE_semop AUE_SEMOP
-#define SYS_AUE_msgctl AUE_MSGCTL
+#define SYS_AUE_freebsd7_msgctl AUE_MSGCTL
#define SYS_AUE_msgget AUE_MSGGET
#define SYS_AUE_msgsnd AUE_MSGSND
#define SYS_AUE_msgrcv AUE_MSGRCV
#define SYS_AUE_shmat AUE_SHMAT
-#define SYS_AUE_shmctl AUE_SHMCTL
+#define SYS_AUE_freebsd7_shmctl AUE_SHMCTL
#define SYS_AUE_shmdt AUE_SHMDT
#define SYS_AUE_shmget AUE_SHMGET
#define SYS_AUE_clock_gettime AUE_NULL
@@ -2514,6 +2533,9 @@ int freebsd4_sigreturn(struct thread *,
#define SYS_AUE_cpuset_getaffinity AUE_NULL
#define SYS_AUE_cpuset_setaffinity AUE_NULL
#define SYS_AUE_closefrom AUE_CLOSEFROM
+#define SYS_AUE___semctl AUE_SEMCTL
+#define SYS_AUE_msgctl AUE_MSGCTL
+#define SYS_AUE_shmctl AUE_SHMCTL
#undef PAD_
#undef PADL_
More information about the svn-src-stable-7
mailing list