From owner-svn-src-head@FreeBSD.ORG Sat Jun 8 13:30:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 48DC3F0F; Sat, 8 Jun 2013 13:30:16 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3A6011601; Sat, 8 Jun 2013 13:30:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r58DUGFx066192; Sat, 8 Jun 2013 13:30:16 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r58DUDaD066178; Sat, 8 Jun 2013 13:30:13 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201306081330.r58DUDaD066178@svn.freebsd.org> From: Gleb Smirnoff Date: Sat, 8 Jun 2013 13:30:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251527 - in head/sys: compat/freebsd32 kern sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jun 2013 13:30:16 -0000 Author: glebius Date: Sat Jun 8 13:30:13 2013 New Revision: 251527 URL: http://svnweb.freebsd.org/changeset/base/251527 Log: aio_mlock() added: - Regen for r251526. - Bump __FreeBSD_version. Modified: head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/freebsd32/freebsd32_syscall.h head/sys/compat/freebsd32/freebsd32_syscalls.c head/sys/compat/freebsd32/freebsd32_sysent.c head/sys/compat/freebsd32/freebsd32_systrace_args.c head/sys/kern/init_sysent.c head/sys/kern/syscalls.c head/sys/kern/systrace_args.c head/sys/sys/param.h head/sys/sys/syscall.h head/sys/sys/syscall.mk head/sys/sys/sysproto.h Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/compat/freebsd32/freebsd32_proto.h Sat Jun 8 13:30:13 2013 (r251527) @@ -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_ @@ -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 @@ -746,6 +749,7 @@ int freebsd32_posix_fallocate(struct thr 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 @@ -1138,6 +1142,7 @@ int freebsd7_freebsd32_shmctl(struct thr #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_ Modified: head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscall.h Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/compat/freebsd32/freebsd32_syscall.h Sat Jun 8 13:30:13 2013 (r251527) @@ -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 @@ -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 Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_syscalls.c Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/compat/freebsd32/freebsd32_syscalls.c Sat Jun 8 13:30:13 2013 (r251527) @@ -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[] = { @@ -572,4 +572,5 @@ const char *freebsd32_syscallnames[] = { "chflagsat", /* 540 = chflagsat */ "accept4", /* 541 = accept4 */ "pipe2", /* 542 = pipe2 */ + "freebsd32_aio_mlock", /* 543 = freebsd32_aio_mlock */ }; Modified: head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_sysent.c Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/compat/freebsd32/freebsd32_sysent.c Sat Jun 8 13:30:13 2013 (r251527) @@ -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" @@ -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 */ }; Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_systrace_args.c Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Sat Jun 8 13:30:13 2013 (r251527) @@ -3221,6 +3221,13 @@ systrace_args(int sysnum, void *params, *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; @@ -8626,6 +8633,16 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* freebsd32_aio_mlock */ + case 543: + switch(ndx) { + case 0: + p = "struct aiocb32 *"; + break; + default: + break; + }; + break; default: break; }; @@ -10456,6 +10473,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* freebsd32_aio_mlock */ + case 543: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; Modified: head/sys/kern/init_sysent.c ============================================================================== --- head/sys/kern/init_sysent.c Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/kern/init_sysent.c Sat Jun 8 13:30:13 2013 (r251527) @@ -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" @@ -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 */ }; Modified: head/sys/kern/syscalls.c ============================================================================== --- head/sys/kern/syscalls.c Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/kern/syscalls.c Sat Jun 8 13:30:13 2013 (r251527) @@ -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[] = { @@ -550,4 +550,5 @@ const char *syscallnames[] = { "chflagsat", /* 540 = chflagsat */ "accept4", /* 541 = accept4 */ "pipe2", /* 542 = pipe2 */ + "aio_mlock", /* 543 = aio_mlock */ }; Modified: head/sys/kern/systrace_args.c ============================================================================== --- head/sys/kern/systrace_args.c Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/kern/systrace_args.c Sat Jun 8 13:30:13 2013 (r251527) @@ -3376,6 +3376,13 @@ systrace_args(int sysnum, void *params, *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; @@ -8995,6 +9002,16 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* aio_mlock */ + case 543: + switch(ndx) { + case 0: + p = "struct aiocb *"; + break; + default: + break; + }; + break; default: break; }; @@ -10938,6 +10955,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* aio_mlock */ + case 543: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/sys/param.h Sat Jun 8 13:30:13 2013 (r251527) @@ -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, Modified: head/sys/sys/syscall.h ============================================================================== --- head/sys/sys/syscall.h Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/sys/syscall.h Sat Jun 8 13:30:13 2013 (r251527) @@ -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 @@ -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 Modified: head/sys/sys/syscall.mk ============================================================================== --- head/sys/sys/syscall.mk Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/sys/syscall.mk Sat Jun 8 13:30:13 2013 (r251527) @@ -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 \ @@ -410,4 +410,5 @@ MIASM = \ connectat.o \ chflagsat.o \ accept4.o \ - pipe2.o + pipe2.o \ + aio_mlock.o Modified: head/sys/sys/sysproto.h ============================================================================== --- head/sys/sys/sysproto.h Sat Jun 8 13:27:57 2013 (r251526) +++ head/sys/sys/sysproto.h Sat Jun 8 13:30:13 2013 (r251527) @@ -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_ @@ -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 *); @@ -2204,6 +2207,7 @@ int sys_connectat(struct thread *, struc 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 @@ -2910,6 +2914,7 @@ int freebsd7_shmctl(struct thread *, str #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_