Date: Mon, 6 Feb 2006 04:49:00 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91226 for review Message-ID: <200602060449.k164n0mR011255@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91226 Change 91226 by imp@imp_harmony on 2006/02/06 04:48:57 IFC @91224 (loopback) Affected files ... .. //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#4 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#4 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#4 integrate .. //depot/projects/arm/src/sys/alpha/linux/syscalls.master#5 integrate .. //depot/projects/arm/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/arm/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/arm/src/sys/conf/NOTES#16 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.h#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.isc#3 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.xenix#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#6 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#9 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/arm/src/sys/modules/Makefile#11 integrate .. //depot/projects/arm/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/pflog/Makefile#1 branch .. //depot/projects/arm/src/sys/netinet6/in6_gif.c#5 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit.h#2 integrate .. //depot/projects/arm/src/sys/sys/namei.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#8 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/arm/src/sys/sys/thr.h#3 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.21 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp */ #include <bsm/audit_kevents.h> @@ -21,156 +21,156 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ - { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ + { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_WAIT4 }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UNMOUNT }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 29 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ - { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ - { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 39 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ - { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 45 = linux_open */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ + { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_SIGPROCMASK }, /* 48 = osf1_sigprocmask */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ - { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_SIGPENDING }, /* 52 = linux_sigpending */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ - { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ - { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ - { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 57 = linux_symlink */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 58 = linux_readlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 63 = getpgrp */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_O_GETPAGESIZE }, /* 64 = linux_getpagesize */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ - { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ - { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 66 = linux_vfork */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 67 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 68 = linux_newlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ - { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 71 = linux_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ - { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ - { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_MUNMAP }, /* 73 = linux_munmap */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_O_VHANGUP }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 79 = linux_setgroups */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 80 = linux_getgroups */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ - { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_SETITIMER }, /* 83 = osf1_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ - { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ - { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ - { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ - { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ - { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ - { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ - { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 92 = linux_fcntl */ + { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_SELECT }, /* 93 = osf1_select */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 94 = poll */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ + { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ + { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ + { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ + { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ - { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ - { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ - { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_RECVMSG }, /* 113 = linux_recvmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_SENDMSG }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ - { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ - { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_GETRUSAGE }, /* 117 = osf1_getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ - { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ - { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ - { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ - { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ - { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ - { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ - { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ - { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ - { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ - { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ - { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ - { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ - { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ + { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ + { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ + { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_SOCKETPAIR }, /* 135 = linux_socketpair */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 136 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 137 = linux_rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 145 = linux_setrlimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ @@ -186,7 +186,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 166 = setdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 166 = setdomainname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ @@ -220,24 +220,24 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ - { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ - { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ - { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ - { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ - { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ - { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ - { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_MSGCTL }, /* 200 = linux_msgctl */ + { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_MSGGET }, /* 201 = linux_msgget */ + { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_MSGRCV }, /* 202 = linux_msgrcv */ + { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_MSGSND }, /* 203 = linux_msgsnd */ + { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_SEMCTL }, /* 204 = linux_semctl */ + { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_SEMGET }, /* 205 = linux_semget */ + { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_SEMOP }, /* 206 = linux_semop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ - { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ - { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ - { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ - { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ - { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 208 = linux_lchown */ + { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_SHMAT }, /* 209 = linux_shmat */ + { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_SHMCTL }, /* 210 = linux_shmctl */ + { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_SHMDT }, /* 211 = linux_shmdt */ + { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_SHMGET }, /* 212 = linux_shmget */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 217 = linux_msync */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ @@ -253,8 +253,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 230 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 231 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPPID }, /* 233 = getpgid */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 234 = linux_getsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ @@ -320,57 +320,57 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 300 = linux_bdflush */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 302 = linux_mount */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_ADJTIME }, /* 303 = linux_old_adjtimex */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 304 = linux_swapoff */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 305 = linux_getdents */ { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ - { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ - { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 311 = linux_reboot */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 312 = linux_clone */ + { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB }, /* 313 = linux_uselib */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 314 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 315 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 316 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 317 = munlockall */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ - { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 319 = linux_sysctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = sys_idle */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 321 = linux_oldumount */ - { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 321 = linux_oldumount */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 322 = swapon */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ - { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ - { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ - { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 324 = linux_personality */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 325 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 326 = linux_setfsgid */ { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ - { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ - { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ - { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ - { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ - { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ - { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 333 = linux_sched_getscheduler */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 328 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 329 = linux_fstatfs */ + { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 330 = sched_setparam */ + { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 331 = sched_getparam */ + { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 332 = linux_sched_setscheduler */ + { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 333 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 335 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 336 = linux_sched_get_priority_min */ - { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 335 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 336 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 337 = sched_rr_get_interval */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 343 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 344 = getresuid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 343 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 344 = getresuid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ - { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ - { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 348 = linux_prctl */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 349 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 350 = linux_pwrite */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ @@ -378,24 +378,24 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ - { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 358 = linux_select */ { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 360 = settimeofday */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 361 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 362 = linux_setitimer */ - { SYF_MPSAFE | AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_NULL }, /* 363 = linux_utimes */ - { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_NULL }, /* 364 = getrusage */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 365 = linux_wait4 */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 366 = linux_adjtimex */ - { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 371 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 372 = getresgid */ + { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 360 = settimeofday */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 361 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 362 = linux_setitimer */ + { SYF_MPSAFE | AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES }, /* 363 = linux_utimes */ + { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 364 = getrusage */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 365 = linux_wait4 */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 366 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 367 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 368 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 369 = linux_capset */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 370 = linux_sendfile */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 371 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 372 = getresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ - { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ - { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 375 = linux_mincore */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 374 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 375 = linux_mincore */ { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 377 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 377 = linux_getdents64 */ }; ==== //depot/projects/arm/src/sys/alpha/linux/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.65 2006/02/04 14:03:22 rwatson Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -462,7 +462,7 @@ 323 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 324 AUE_PERSONALITY MSTD { int linux_personality(l_ulong per); } 325 AUE_SETFSUID MSTD { int linux_setfsuid(l_uid_t uid); } -326 AUE_GETFSUID MSTD { int linux_setfsgid(l_gid_t gid); } +326 AUE_SETFSGID MSTD { int linux_setfsgid(l_gid_t gid); } 327 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } 328 AUE_STATFS MSTD { int linux_statfs(char *path, \ ==== //depot/projects/arm/src/sys/arm/include/atomic.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.15 2005/12/09 22:58:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.16 2006/02/05 22:06:12 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -154,17 +154,16 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "cmp %1, %3\n" - "streq %4, %2\n" + "streq %4, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" "moveq %1, #1\n" "movne %1, #0\n" : "=r" (ras_start), "=r" (done) - ,"=m" (*p), "+r" (cmpval), "+r" (newval) - : "m" (*p)); + ,"+r" (p), "+r" (cmpval), "+r" (newval)); return (done); } @@ -180,14 +179,13 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "add %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (val) - : "m" (*p)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); } static __inline void @@ -202,15 +200,14 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "sub %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (val) - : "m" (*p)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (val)); } static __inline void @@ -225,15 +222,14 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "orr %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*address), "+r" (setmask) - : "m" (*address)); + : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (setmask)); } static __inline void @@ -248,14 +244,13 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "bic %1, %1, %3\n" - "str %1, %2\n" + "str %1, [%2]\n" "2:\n" "mov %1, #0\n" "str %1, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*address), "+r" (clearmask) - : "m" (*address)); + : "=r" (ras_start), "=r" (start), "+r" (address), "+r" (clearmask)); } @@ -271,14 +266,13 @@ "adr %1, 1b\n" "mov %0, #0xe0000004\n" "str %1, [%0]\n" - "ldr %1, %2\n" + "ldr %1, [%2]\n" "add %3, %1, %3\n" - "str %3, %2\n" + "str %3, [%2]\n" "2:\n" "mov %3, #0\n" "str %3, [%0]\n" - : "=r" (ras_start), "=r" (start), "=m" (*p), "+r" (v) - : "m" (*p)); + : "=r" (ras_start), "=r" (start), "+r" (p), "+r" (v)); return (start); } ==== //depot/projects/arm/src/sys/bsm/audit_kevents.h#5 (text+ko) ==== @@ -30,8 +30,8 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#4 $ - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.4 2006/02/04 13:22:44 rwatson Exp $ + * $P4: //depot/projects/arm/src/sys/bsm/audit_kevents.h#5 $ + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.5 2006/02/06 01:12:46 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -361,7 +361,7 @@ #define AUE_NMOUNT 380 /* FreeBSD-specific. */ #define AUE_BDFLUSH 381 /* Linux-specific. */ #define AUE_SETFSUID 382 /* Linux-specific. */ -#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_SETFSGID 383 /* Linux-specific. */ #define AUE_PERSONALITY 384 /* Linux-specific. */ #define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ #define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ @@ -384,6 +384,7 @@ #define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ #define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ #define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ +#define AUE_SYSARCH 406 /* FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the ==== //depot/projects/arm/src/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1351 2006/02/03 15:53:37 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1352 2006/02/05 05:06:04 kensmith Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1478,12 +1478,6 @@ #options SYM_SETUP_MAX_LUN #-Number of LUNs supported # default:8, range:[1..64] -# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID -# controllers (SmartRAID V and VI and later). -# These controllers require the CAM infrastructure. -# -device asr - # The 'dpt' driver provides support for old DPT controllers (http://www.dpt.com/). # These have hardware RAID-{0,1,5} support, and do multi-initiator I/O. # The DPT controllers are commonly re-licensed under other brand-names - ==== //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.18 2005/12/05 11:58:31 ru Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.19 2006/02/05 17:17:32 mlaier Exp $ */ /* $OpenBSD: if_pflog.c,v 1.12 2004/05/19 17:50:51 dhartmei Exp $ */ /* @@ -376,9 +376,15 @@ case MOD_LOAD: LIST_INIT(&pflog_list); if_clone_attach(&pflog_cloner); + PF_LOCK(); + pflog_packet_ptr = pflog_packet; + PF_UNLOCK(); break; case MOD_UNLOAD: + PF_LOCK(); + pflog_packet_ptr = NULL; + PF_UNLOCK(); if_clone_detach(&pflog_cloner); break; @@ -400,4 +406,5 @@ DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); MODULE_VERSION(pflog, PFLOG_MODVER); +MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER); #endif /* __FreeBSD__ */ ==== //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.h,v 1.6 2005/06/10 16:49:03 brooks Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.h,v 1.7 2006/02/05 17:17:32 mlaier Exp $ */ /* $OpenBSD: if_pflog.h,v 1.11 2004/05/19 17:50:51 dhartmei Exp $ */ /* @@ -70,10 +70,24 @@ #ifdef _KERNEL +#ifdef __FreeBSD__ +/* XXX */ +#include <net/pfvar.h> + +typedef int pflog_packet_t(struct pfi_kif *, struct mbuf *, sa_family_t, + u_int8_t, u_int8_t, struct pf_rule *, struct pf_rule *, + struct pf_ruleset *); +extern pflog_packet_t *pflog_packet_ptr; +#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) do { \ + if (pflog_packet_ptr != NULL) \ + pflog_packet_ptr(i,a,b,c,d,e,f,g); \ +} while (0) +#else #if NPFLOG > 0 #define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) pflog_packet(i,a,b,c,d,e,f,g) #else #define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) ((void)0) #endif /* NPFLOG > 0 */ +#endif /* __FreeBSD__ */ #endif /* _KERNEL */ #endif /* _NET_IF_PFLOG_H_ */ ==== //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.22 2005/12/05 11:58:31 ru Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.23 2006/02/05 17:17:32 mlaier Exp $ */ /* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ /* @@ -108,6 +108,10 @@ #include <net/if_pfsync.h> #endif /* NPFSYNC > 0 */ +#ifdef __FreeBSD__ +#include <net/if_pflog.h> +#endif + #ifdef INET6 #include <netinet/ip6.h> #include <netinet/in_pcb.h> @@ -230,6 +234,7 @@ static volatile int pf_pfil_hooked = 0; struct mtx pf_task_mtx; +pflog_packet_t *pflog_packet_ptr = NULL; void init_pf_mutex(void) ==== //depot/projects/arm/src/sys/dev/asr/asr.c#6 (text+ko) ==== @@ -165,7 +165,7 @@ #include <dev/asr/sys_info.h> -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.75 2006/02/04 17:56:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.76 2006/02/05 05:05:27 scottl Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '1' @@ -538,7 +538,7 @@ static U32 ASR_initiateCp(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message) { - U32 Mask = -1L; + U32 Mask = 0xffffffff; U32 MessageOffset; u_int Delay = 1500; @@ -609,7 +609,7 @@ KASSERT(*Reply_Ptr != 0, ("*Reply_Ptr == 0")); return(*Reply_Ptr); } - KASSERT(Old != -1L, ("Old == -1")); + KASSERT(Old != 0xffffffff, ("Old == -1")); return (0); } /* ASR_resetIOP */ ==== //depot/projects/arm/src/sys/dev/sound/isa/mss.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include <dev/sound/pcm/sound.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.103 2005/11/07 09:25:15 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.105 2006/02/05 17:35:13 netchild Exp $"); /* board-specific include files */ #include <dev/sound/isa/mss.h> @@ -2027,8 +2027,10 @@ mss->conf_rid = 3; mss->bd_id = MD_OPTI924; mss->bd_flags |= BD_F_924PNP; - if(opti_init(dev, mss) != 0) + if(opti_init(dev, mss) != 0) { + free(mss, M_DEVBUF); return ENXIO; + } break; case 0x1022b839: /* NMX2210 */ @@ -2037,8 +2039,10 @@ case 0x01005407: /* AZT0001 */ /* put into MSS mode first (snatched from NetBSD) */ - if (azt2320_mss_mode(mss, dev) == -1) + if (azt2320_mss_mode(mss, dev) == -1) { + free(mss, M_DEVBUF); return ENXIO; + } mss->bd_flags |= BD_F_MSS_OFFSET; mss->io_rid = 2; ==== //depot/projects/arm/src/sys/dev/sound/pci/csapcm.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.35 2005/09/11 14:15:05 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.37 2006/02/05 17:34:13 netchild Exp $"); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) @@ -722,6 +722,8 @@ { csa_res *resp; + KASSERT(csa != NULL, ("called with bogus resource structure")); + resp = &csa->res; if (resp->irq != NULL) { if (csa->ih) @@ -741,10 +743,8 @@ bus_dma_tag_destroy(csa->parent_dmat); csa->parent_dmat = NULL; } - if (csa != NULL) { - free(csa, M_DEVBUF); - csa = NULL; - } + + free(csa, M_DEVBUF); } static int ==== //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.97 2005/10/02 15:43:57 netchild Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.98 2006/02/05 17:47:26 netchild Exp $"); devclass_t pcm_devclass; @@ -862,6 +862,10 @@ SLIST_FOREACH(sce, &d->channels, link) { c = sce->channel; + + KASSERT(c->bufhard != NULL && c->bufsoft != NULL, + ("hosed pcm channel setup")); + sbuf_printf(s, "\n\t"); /* it would be better to indent child channels */ @@ -877,24 +881,22 @@ sbuf_printf(s, ", pid %d", c->pid); sbuf_printf(s, "\n\t"); - if (c->bufhard != NULL && c->bufsoft != NULL) { - sbuf_printf(s, "interrupts %d, ", c->interrupts); - if (c->direction == PCMDIR_REC) - sbuf_printf(s, "overruns %d, hfree %d, sfree %d [b:%d/%d/%d|bs:%d/%d/%d]", - c->xruns, sndbuf_getfree(c->bufhard), sndbuf_getfree(c->bufsoft), - sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), - sndbuf_getblkcnt(c->bufhard), - sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), - sndbuf_getblkcnt(c->bufsoft)); - else - sbuf_printf(s, "underruns %d, ready %d [b:%d/%d/%d|bs:%d/%d/%d]", - c->xruns, sndbuf_getready(c->bufsoft), - sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), - sndbuf_getblkcnt(c->bufhard), - sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), - sndbuf_getblkcnt(c->bufsoft)); - sbuf_printf(s, "\n\t"); - } + sbuf_printf(s, "interrupts %d, ", c->interrupts); + if (c->direction == PCMDIR_REC) + sbuf_printf(s, "overruns %d, hfree %d, sfree %d [b:%d/%d/%d|bs:%d/%d/%d]", + c->xruns, sndbuf_getfree(c->bufhard), sndbuf_getfree(c->bufsoft), + sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), + sndbuf_getblkcnt(c->bufhard), + sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), + sndbuf_getblkcnt(c->bufsoft)); + else + sbuf_printf(s, "underruns %d, ready %d [b:%d/%d/%d|bs:%d/%d/%d]", + c->xruns, sndbuf_getready(c->bufsoft), + sndbuf_getsize(c->bufhard), sndbuf_getblksz(c->bufhard), + sndbuf_getblkcnt(c->bufhard), + sndbuf_getsize(c->bufsoft), sndbuf_getblksz(c->bufsoft), + sndbuf_getblkcnt(c->bufsoft)); + sbuf_printf(s, "\n\t"); sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "hardware" : "userland"); sbuf_printf(s, " -> "); ==== //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602060449.k164n0mR011255>