Skip to content

Commit

Permalink
aio_mlock() added:
Browse files Browse the repository at this point in the history
  - Regen for r251526.
  - Bump __FreeBSD_version.
  • Loading branch information
glebius committed Jun 8, 2013
1 parent 9a02f30 commit 85cf0e0
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 13 deletions.
7 changes: 6 additions & 1 deletion sys/compat/freebsd32/freebsd32_proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

#ifndef _FREEBSD32_SYSPROTO_H_
Expand Down Expand Up @@ -628,6 +628,9 @@ struct freebsd32_wait6_args {
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
};
#endif
struct freebsd32_aio_mlock_args {
char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)];
};
#if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
#define PAD64_REQUIRED
#endif
Expand Down Expand Up @@ -746,6 +749,7 @@ int freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_
int freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *);
int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
#endif
int freebsd32_aio_mlock(struct thread *, struct freebsd32_aio_mlock_args *);

#ifdef COMPAT_43

Expand Down Expand Up @@ -1138,6 +1142,7 @@ int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_
#define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_posix_fadvise AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_wait6 AUE_WAIT6
#define FREEBSD32_SYS_AUE_freebsd32_aio_mlock AUE_NULL

#undef PAD_
#undef PADL_
Expand Down
5 changes: 3 additions & 2 deletions sys/compat/freebsd32/freebsd32_syscall.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

#define FREEBSD32_SYS_syscall 0
Expand Down Expand Up @@ -443,4 +443,5 @@
#define FREEBSD32_SYS_chflagsat 540
#define FREEBSD32_SYS_accept4 541
#define FREEBSD32_SYS_pipe2 542
#define FREEBSD32_SYS_MAXSYSCALL 543
#define FREEBSD32_SYS_freebsd32_aio_mlock 543
#define FREEBSD32_SYS_MAXSYSCALL 544
3 changes: 2 additions & 1 deletion sys/compat/freebsd32/freebsd32_syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

const char *freebsd32_syscallnames[] = {
Expand Down Expand Up @@ -572,4 +572,5 @@ const char *freebsd32_syscallnames[] = {
"chflagsat", /* 540 = chflagsat */
"accept4", /* 541 = accept4 */
"pipe2", /* 542 = pipe2 */
"freebsd32_aio_mlock", /* 543 = freebsd32_aio_mlock */
};
3 changes: 2 additions & 1 deletion sys/compat/freebsd32/freebsd32_sysent.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

#include "opt_compat.h"
Expand Down Expand Up @@ -609,4 +609,5 @@ struct sysent freebsd32_sysent[] = {
{ AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 540 = chflagsat */
{ AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 541 = accept4 */
{ AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 542 = pipe2 */
{ AS(freebsd32_aio_mlock_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = freebsd32_aio_mlock */
};
22 changes: 22 additions & 0 deletions sys/compat/freebsd32/freebsd32_systrace_args.c
Original file line number Diff line number Diff line change
Expand Up @@ -3221,6 +3221,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 2;
break;
}
/* freebsd32_aio_mlock */
case 543: {
struct freebsd32_aio_mlock_args *p = params;
uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
*n_args = 1;
break;
}
default:
*n_args = 0;
break;
Expand Down Expand Up @@ -8626,6 +8633,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
};
break;
/* freebsd32_aio_mlock */
case 543:
switch(ndx) {
case 0:
p = "struct aiocb32 *";
break;
default:
break;
};
break;
default:
break;
};
Expand Down Expand Up @@ -10456,6 +10473,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* freebsd32_aio_mlock */
case 543:
if (ndx == 0 || ndx == 1)
p = "int";
break;
default:
break;
};
Expand Down
3 changes: 2 additions & 1 deletion sys/kern/init_sysent.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/kern/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/kern/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

#include "opt_compat.h"
Expand Down Expand Up @@ -577,4 +577,5 @@ struct sysent sysent[] = {
{ AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 540 = chflagsat */
{ AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 541 = accept4 */
{ AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 542 = pipe2 */
{ AS(aio_mlock_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = aio_mlock */
};
3 changes: 2 additions & 1 deletion sys/kern/syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/kern/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/kern/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

const char *syscallnames[] = {
Expand Down Expand Up @@ -550,4 +550,5 @@ const char *syscallnames[] = {
"chflagsat", /* 540 = chflagsat */
"accept4", /* 541 = accept4 */
"pipe2", /* 542 = pipe2 */
"aio_mlock", /* 543 = aio_mlock */
};
22 changes: 22 additions & 0 deletions sys/kern/systrace_args.c
Original file line number Diff line number Diff line change
Expand Up @@ -3376,6 +3376,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 2;
break;
}
/* aio_mlock */
case 543: {
struct aio_mlock_args *p = params;
uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
*n_args = 1;
break;
}
default:
*n_args = 0;
break;
Expand Down Expand Up @@ -8995,6 +9002,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
};
break;
/* aio_mlock */
case 543:
switch(ndx) {
case 0:
p = "struct aiocb *";
break;
default:
break;
};
break;
default:
break;
};
Expand Down Expand Up @@ -10938,6 +10955,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* aio_mlock */
case 543:
if (ndx == 0 || ndx == 1)
p = "int";
break;
default:
break;
};
Expand Down
2 changes: 1 addition & 1 deletion sys/sys/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 1000034 /* Master, propagated to newvers */
#define __FreeBSD_version 1000035 /* Master, propagated to newvers */

/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Expand Down
5 changes: 3 additions & 2 deletions sys/sys/syscall.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/kern/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/kern/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

#define SYS_syscall 0
Expand Down Expand Up @@ -462,4 +462,5 @@
#define SYS_chflagsat 540
#define SYS_accept4 541
#define SYS_pipe2 542
#define SYS_MAXSYSCALL 543
#define SYS_aio_mlock 543
#define SYS_MAXSYSCALL 544
5 changes: 3 additions & 2 deletions sys/sys/syscall.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# FreeBSD system call names.
# DO NOT EDIT-- this file is automatically generated.
# $FreeBSD$
# created from FreeBSD: head/sys/kern/syscalls.master 250853 2013-05-21 11:40:16Z kib
# created from FreeBSD: head/sys/kern/syscalls.master 251526 2013-06-08 13:27:57Z glebius
MIASM = \
syscall.o \
exit.o \
Expand Down Expand Up @@ -410,4 +410,5 @@ MIASM = \
connectat.o \
chflagsat.o \
accept4.o \
pipe2.o
pipe2.o \
aio_mlock.o
7 changes: 6 additions & 1 deletion sys/sys/sysproto.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
* created from FreeBSD: head/sys/kern/syscalls.master 250853 2013-05-21 11:40:16Z kib
* created from FreeBSD: head/sys/kern/syscalls.master 251526 2013-06-08 13:27:57Z glebius
*/

#ifndef _SYS_SYSPROTO_H_
Expand Down Expand Up @@ -1812,6 +1812,9 @@ struct pipe2_args {
char fildes_l_[PADL_(int *)]; int * fildes; char fildes_r_[PADR_(int *)];
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
struct aio_mlock_args {
char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
};
int nosys(struct thread *, struct nosys_args *);
void sys_sys_exit(struct thread *, struct sys_exit_args *);
int sys_fork(struct thread *, struct fork_args *);
Expand Down Expand Up @@ -2204,6 +2207,7 @@ int sys_connectat(struct thread *, struct connectat_args *);
int sys_chflagsat(struct thread *, struct chflagsat_args *);
int sys_accept4(struct thread *, struct accept4_args *);
int sys_pipe2(struct thread *, struct pipe2_args *);
int sys_aio_mlock(struct thread *, struct aio_mlock_args *);

#ifdef COMPAT_43

Expand Down Expand Up @@ -2910,6 +2914,7 @@ int freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *);
#define SYS_AUE_chflagsat AUE_CHFLAGSAT
#define SYS_AUE_accept4 AUE_ACCEPT
#define SYS_AUE_pipe2 AUE_PIPE
#define SYS_AUE_aio_mlock AUE_NULL

#undef PAD_
#undef PADL_
Expand Down

0 comments on commit 85cf0e0

Please sign in to comment.