Date: Fri, 16 Sep 2011 13:58:51 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225617 - in head/sys: amd64/amd64 amd64/linux32 arm/arm cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/sparc/dtrace compat/freebsd32 compat/linux compat/svr4 d... Message-ID: <201109161358.p8GDwptH024793@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Sep 16 13:58:51 2011 New Revision: 225617 URL: http://svn.freebsd.org/changeset/base/225617 Log: In order to maximize the re-usability of kernel code in user space this patch modifies makesyscalls.sh to prefix all of the non-compatibility calls (e.g. not linux_, freebsd32_) with sys_ and updates the kernel entry points and all places in the code that use them. It also fixes an additional name space collision between the kernel function psignal and the libc function of the same name by renaming the kernel psignal kern_psignal(). By introducing this change now we will ease future MFCs that change syscalls. Reviewed by: rwatson Approved by: re (bz) Modified: head/sys/amd64/amd64/machdep.c head/sys/amd64/linux32/linux32_machdep.c head/sys/arm/arm/machdep.c head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c head/sys/compat/freebsd32/freebsd32_ioctl.c head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/freebsd32_util.h head/sys/compat/linux/linux_emul.c head/sys/compat/linux/linux_file.c head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_ipc.c head/sys/compat/linux/linux_misc.c head/sys/compat/linux/linux_signal.c head/sys/compat/linux/linux_socket.c head/sys/compat/linux/linux_uid16.c head/sys/compat/svr4/svr4_fcntl.c head/sys/compat/svr4/svr4_filio.c head/sys/compat/svr4/svr4_ipc.c head/sys/compat/svr4/svr4_misc.c head/sys/compat/svr4/svr4_signal.c head/sys/compat/svr4/svr4_socket.c head/sys/compat/svr4/svr4_stat.c head/sys/compat/svr4/svr4_stream.c head/sys/dev/bktr/bktr_core.c head/sys/dev/hwpmc/hwpmc_logging.c head/sys/dev/hwpmc/hwpmc_mod.c head/sys/dev/iscsi/initiator/isc_soc.c head/sys/dev/mfi/mfi.c head/sys/dev/sound/midi/midi.c head/sys/dev/syscons/scmouse.c head/sys/dev/syscons/syscons.c head/sys/dev/usb/usb_dev.c head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/procfs/procfs_ctl.c head/sys/fs/procfs/procfs_ioctl.c head/sys/i386/i386/machdep.c head/sys/i386/i386/trap.c head/sys/i386/ibcs2/ibcs2_ioctl.c head/sys/i386/ibcs2/ibcs2_ipc.c head/sys/i386/ibcs2/ibcs2_misc.c head/sys/i386/ibcs2/ibcs2_other.c head/sys/i386/ibcs2/ibcs2_signal.c head/sys/i386/ibcs2/ibcs2_socksys.c head/sys/i386/ibcs2/ibcs2_xenix.c head/sys/i386/linux/linux_machdep.c head/sys/ia64/ia32/ia32_signal.c head/sys/ia64/ia64/machdep.c head/sys/kern/init_main.c head/sys/kern/kern_acct.c head/sys/kern/kern_context.c head/sys/kern/kern_cpuset.c head/sys/kern/kern_descrip.c head/sys/kern/kern_environment.c head/sys/kern/kern_event.c head/sys/kern/kern_exec.c head/sys/kern/kern_exit.c head/sys/kern/kern_fork.c head/sys/kern/kern_jail.c head/sys/kern/kern_ktrace.c head/sys/kern/kern_linker.c head/sys/kern/kern_loginclass.c head/sys/kern/kern_module.c head/sys/kern/kern_ntptime.c head/sys/kern/kern_proc.c head/sys/kern/kern_prot.c head/sys/kern/kern_rctl.c head/sys/kern/kern_resource.c head/sys/kern/kern_shutdown.c head/sys/kern/kern_sig.c head/sys/kern/kern_synch.c head/sys/kern/kern_sysctl.c head/sys/kern/kern_thr.c head/sys/kern/kern_time.c head/sys/kern/kern_umtx.c head/sys/kern/kern_uuid.c head/sys/kern/makesyscalls.sh head/sys/kern/p1003_1b.c head/sys/kern/subr_bus.c head/sys/kern/subr_prof.c head/sys/kern/subr_trap.c head/sys/kern/sys_capability.c head/sys/kern/sys_generic.c head/sys/kern/sys_pipe.c head/sys/kern/sys_procdesc.c head/sys/kern/sys_process.c head/sys/kern/sysv_msg.c head/sys/kern/sysv_sem.c head/sys/kern/sysv_shm.c head/sys/kern/tty.c head/sys/kern/tty_pts.c head/sys/kern/uipc_mqueue.c head/sys/kern/uipc_sem.c head/sys/kern/uipc_shm.c head/sys/kern/uipc_syscalls.c head/sys/kern/vfs_acl.c head/sys/kern/vfs_aio.c head/sys/kern/vfs_cache.c head/sys/kern/vfs_extattr.c head/sys/kern/vfs_mount.c head/sys/kern/vfs_syscalls.c head/sys/kern/vfs_vnops.c head/sys/kgssapi/gss_impl.c head/sys/mips/mips/pm_machdep.c head/sys/net/route.c head/sys/nfs/nfs_nfssvc.c head/sys/nlm/nlm_prot_impl.c head/sys/pc98/pc98/machdep.c head/sys/powerpc/powerpc/exec_machdep.c head/sys/security/audit/audit_syscalls.c head/sys/security/mac/mac_syscalls.c head/sys/sparc64/sparc64/machdep.c head/sys/sys/posix4.h head/sys/sys/signalvar.h head/sys/sys/sysent.h head/sys/vm/swap_pager.c head/sys/vm/vm_mmap.c head/sys/vm/vm_unix.c Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/amd64/amd64/machdep.c Fri Sep 16 13:58:51 2011 (r225617) @@ -421,7 +421,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, * MPSAFE */ int -sigreturn(td, uap) +sys_sigreturn(td, uap) struct thread *td; struct sigreturn_args /* { const struct __ucontext *sigcntxp; @@ -517,7 +517,7 @@ int freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap) { - return sigreturn(td, (struct sigreturn_args *)uap); + return sys_sigreturn(td, (struct sigreturn_args *)uap); } #endif Modified: head/sys/amd64/linux32/linux32_machdep.c ============================================================================== --- head/sys/amd64/linux32/linux32_machdep.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/amd64/linux32/linux32_machdep.c Fri Sep 16 13:58:51 2011 (r225617) @@ -658,7 +658,7 @@ linux_mmap_common(struct thread *td, l_u (void *)bsd_args.addr, (int)bsd_args.len, bsd_args.prot, bsd_args.flags, bsd_args.fd, (int)bsd_args.pos); #endif - error = mmap(td, &bsd_args); + error = sys_mmap(td, &bsd_args); #ifdef DEBUG if (ldebug(mmap)) printf("-> %s() return: 0x%x (0x%08x)\n", @@ -677,7 +677,7 @@ linux_mprotect(struct thread *td, struct bsd_args.prot = uap->prot; if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; - return (mprotect(td, &bsd_args)); + return (sys_mprotect(td, &bsd_args)); } int @@ -863,7 +863,7 @@ linux_ftruncate64(struct thread *td, str sa.fd = args->fd; sa.length = args->length; - return ftruncate(td, &sa); + return sys_ftruncate(td, &sa); } int Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/arm/arm/machdep.c Fri Sep 16 13:58:51 2011 (r225617) @@ -605,7 +605,7 @@ set_mcontext(struct thread *td, const mc * MPSAFE */ int -sigreturn(td, uap) +sys_sigreturn(td, uap) struct thread *td; struct sigreturn_args /* { const struct __ucontext *sigcntxp; Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Fri Sep 16 13:58:51 2011 (r225617) @@ -5669,7 +5669,7 @@ dtrace_action_raise(uint64_t sig) #else struct proc *p = curproc; PROC_LOCK(p); - psignal(p, sig); + kern_psignal(p, sig); PROC_UNLOCK(p); #endif } @@ -5689,7 +5689,7 @@ dtrace_action_stop(void) #else struct proc *p = curproc; PROC_LOCK(p); - psignal(p, SIGSTOP); + kern_psignal(p, SIGSTOP); PROC_UNLOCK(p); #endif } Modified: head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c Fri Sep 16 13:58:51 2011 (r225617) @@ -1474,7 +1474,7 @@ err: * If the copy in failed, the process will be in a irrecoverable * state, and we have no choice but to kill it. */ - psignal(ttoproc(curthread), SIGILL); + kern_psignal(ttoproc(curthread), SIGILL); return (0); } @@ -1593,5 +1593,5 @@ err: * If we couldn't record this register's value, the process is in an * irrecoverable state and we have no choice but to euthanize it. */ - psignal(ttoproc(curthread), SIGILL); + kern_psignal(ttoproc(curthread), SIGILL); } Modified: head/sys/compat/freebsd32/freebsd32_ioctl.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_ioctl.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/compat/freebsd32/freebsd32_ioctl.c Fri Sep 16 13:58:51 2011 (r225617) @@ -396,7 +396,7 @@ freebsd32_ioctl(struct thread *td, struc ap.fd = uap->fd; ap.com = uap->com; PTRIN_CP(*uap, ap, data); - return ioctl(td, &ap); + return sys_ioctl(td, &ap); } fdrop(fp, td); Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/compat/freebsd32/freebsd32_misc.c Fri Sep 16 13:58:51 2011 (r225617) @@ -425,7 +425,7 @@ freebsd32_mmap_partial(struct thread *td r.buf = (void *) start; r.nbyte = end - start; r.offset = pos; - return (pread(td, &r)); + return (sys_pread(td, &r)); } else { while (start < end) { subyte((void *) start, 0); @@ -500,7 +500,7 @@ freebsd32_mmap(struct thread *td, struct r.buf = (void *) start; r.nbyte = end - start; r.offset = pos; - error = pread(td, &r); + error = sys_pread(td, &r); if (error) return (error); @@ -527,7 +527,7 @@ freebsd32_mmap(struct thread *td, struct ap.fd = fd; ap.pos = pos; - return (mmap(td, &ap)); + return (sys_mmap(td, &ap)); } #ifdef COMPAT_FREEBSD6 @@ -1401,7 +1401,7 @@ freebsd32_pread(struct thread *td, struc ap.buf = uap->buf; ap.nbyte = uap->nbyte; ap.offset = PAIR32TO64(off_t,uap->offset); - return (pread(td, &ap)); + return (sys_pread(td, &ap)); } int @@ -1413,7 +1413,7 @@ freebsd32_pwrite(struct thread *td, stru ap.buf = uap->buf; ap.nbyte = uap->nbyte; ap.offset = PAIR32TO64(off_t,uap->offset); - return (pwrite(td, &ap)); + return (sys_pwrite(td, &ap)); } #ifdef COMPAT_43 @@ -1425,7 +1425,7 @@ ofreebsd32_lseek(struct thread *td, stru nuap.fd = uap->fd; nuap.offset = uap->offset; nuap.whence = uap->whence; - return (lseek(td, &nuap)); + return (sys_lseek(td, &nuap)); } #endif @@ -1439,7 +1439,7 @@ freebsd32_lseek(struct thread *td, struc ap.fd = uap->fd; ap.offset = PAIR32TO64(off_t,uap->offset); ap.whence = uap->whence; - error = lseek(td, &ap); + error = sys_lseek(td, &ap); /* Expand the quad return into two parts for eax and edx */ pos = *(off_t *)(td->td_retval); td->td_retval[RETVAL_LO] = pos & 0xffffffff; /* %eax */ @@ -1454,7 +1454,7 @@ freebsd32_truncate(struct thread *td, st ap.path = uap->path; ap.length = PAIR32TO64(off_t,uap->length); - return (truncate(td, &ap)); + return (sys_truncate(td, &ap)); } int @@ -1464,7 +1464,7 @@ freebsd32_ftruncate(struct thread *td, s ap.fd = uap->fd; ap.length = PAIR32TO64(off_t,uap->length); - return (ftruncate(td, &ap)); + return (sys_ftruncate(td, &ap)); } #ifdef COMPAT_43 @@ -1519,7 +1519,7 @@ freebsd6_freebsd32_pread(struct thread * ap.buf = uap->buf; ap.nbyte = uap->nbyte; ap.offset = PAIR32TO64(off_t,uap->offset); - return (pread(td, &ap)); + return (sys_pread(td, &ap)); } int @@ -1531,7 +1531,7 @@ freebsd6_freebsd32_pwrite(struct thread ap.buf = uap->buf; ap.nbyte = uap->nbyte; ap.offset = PAIR32TO64(off_t,uap->offset); - return (pwrite(td, &ap)); + return (sys_pwrite(td, &ap)); } int @@ -1544,7 +1544,7 @@ freebsd6_freebsd32_lseek(struct thread * ap.fd = uap->fd; ap.offset = PAIR32TO64(off_t,uap->offset); ap.whence = uap->whence; - error = lseek(td, &ap); + error = sys_lseek(td, &ap); /* Expand the quad return into two parts for eax and edx */ pos = *(off_t *)(td->td_retval); td->td_retval[RETVAL_LO] = pos & 0xffffffff; /* %eax */ @@ -1559,7 +1559,7 @@ freebsd6_freebsd32_truncate(struct threa ap.path = uap->path; ap.length = PAIR32TO64(off_t,uap->length); - return (truncate(td, &ap)); + return (sys_truncate(td, &ap)); } int @@ -1569,7 +1569,7 @@ freebsd6_freebsd32_ftruncate(struct thre ap.fd = uap->fd; ap.length = PAIR32TO64(off_t,uap->length); - return (ftruncate(td, &ap)); + return (sys_ftruncate(td, &ap)); } #endif /* COMPAT_FREEBSD6 */ @@ -2409,7 +2409,7 @@ freebsd32_cpuset_setid(struct thread *td ap.id = PAIR32TO64(id_t,uap->id); ap.setid = uap->setid; - return (cpuset_setid(td, &ap)); + return (sys_cpuset_setid(td, &ap)); } int @@ -2423,7 +2423,7 @@ freebsd32_cpuset_getid(struct thread *td ap.id = PAIR32TO64(id_t,uap->id); ap.setid = uap->setid; - return (cpuset_getid(td, &ap)); + return (sys_cpuset_getid(td, &ap)); } int @@ -2438,7 +2438,7 @@ freebsd32_cpuset_getaffinity(struct thre ap.cpusetsize = uap->cpusetsize; ap.mask = uap->mask; - return (cpuset_getaffinity(td, &ap)); + return (sys_cpuset_getaffinity(td, &ap)); } int @@ -2453,7 +2453,7 @@ freebsd32_cpuset_setaffinity(struct thre ap.cpusetsize = uap->cpusetsize; ap.mask = uap->mask; - return (cpuset_setaffinity(td, &ap)); + return (sys_cpuset_setaffinity(td, &ap)); } int @@ -2813,5 +2813,5 @@ freebsd32_posix_fallocate(struct thread ap.fd = uap->fd; ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32)); ap.len = (uap->lenlo | ((off_t)uap->lenhi << 32)); - return (posix_fallocate(td, &ap)); + return (sys_posix_fallocate(td, &ap)); } Modified: head/sys/compat/freebsd32/freebsd32_util.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_util.h Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/compat/freebsd32/freebsd32_util.h Fri Sep 16 13:58:51 2011 (r225617) @@ -88,6 +88,15 @@ SYSCALL32_MODULE(syscallname, .syscall_no = FREEBSD32_SYS_##syscallname \ } +#define SYSCALL32_INIT_HELPER_COMPAT(syscallname) { \ + .new_sysent = { \ + .sy_narg = (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + .sy_call = (sy_call_t *)& sys_ ## syscallname, \ + }, \ + .syscall_no = FREEBSD32_SYS_##syscallname \ +} + int syscall32_register(int *offset, struct sysent *new_sysent, struct sysent *old_sysent); int syscall32_deregister(int *offset, struct sysent *old_sysent); Modified: head/sys/compat/linux/linux_emul.c ============================================================================== --- head/sys/compat/linux/linux_emul.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/compat/linux/linux_emul.c Fri Sep 16 13:58:51 2011 (r225617) @@ -244,7 +244,7 @@ linux_proc_exit(void *arg __unused, stru KASSERT(em != NULL, ("linux_reparent: emuldata not found: %i\n", q->p_pid)); PROC_LOCK(q); if ((q->p_flag & P_WEXIT) == 0 && em->pdeath_signal != 0) { - psignal(q, em->pdeath_signal); + kern_psignal(q, em->pdeath_signal); } PROC_UNLOCK(q); EMUL_UNLOCK(&emul_lock); @@ -362,7 +362,7 @@ linux_kill_threads(struct thread *td, in sp = pfind(em->pid); if ((sp->p_flag & P_WEXIT) == 0) - psignal(sp, sig); + kern_psignal(sp, sig); PROC_UNLOCK(sp); #ifdef DEBUG printf(LMSG("linux_kill_threads: kill PID %d\n"), em->pid); Modified: head/sys/compat/linux/linux_file.c ============================================================================== --- head/sys/compat/linux/linux_file.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/compat/linux/linux_file.c Fri Sep 16 13:58:51 2011 (r225617) @@ -232,7 +232,7 @@ linux_lseek(struct thread *td, struct li tmp_args.fd = args->fdes; tmp_args.offset = (off_t)args->off; tmp_args.whence = args->whence; - error = lseek(td, &tmp_args); + error = sys_lseek(td, &tmp_args); return error; } @@ -254,7 +254,7 @@ linux_llseek(struct thread *td, struct l bsd_args.offset = off; bsd_args.whence = args->whence; - if ((error = lseek(td, &bsd_args))) + if ((error = sys_lseek(td, &bsd_args))) return error; if ((error = copyout(td->td_retval, args->res, sizeof (off_t)))) @@ -951,7 +951,7 @@ linux_ftruncate(struct thread *td, struc nuap.fd = args->fd; nuap.length = args->length; - return (ftruncate(td, &nuap)); + return (sys_ftruncate(td, &nuap)); } int @@ -1021,7 +1021,7 @@ linux_fdatasync(td, uap) struct fsync_args bsd; bsd.fd = uap->fd; - return fsync(td, &bsd); + return sys_fsync(td, &bsd); } int @@ -1038,7 +1038,7 @@ linux_pread(td, uap) bsd.nbyte = uap->nbyte; bsd.offset = uap->offset; - error = pread(td, &bsd); + error = sys_pread(td, &bsd); if (error == 0) { /* This seems to violate POSIX but linux does it */ @@ -1065,7 +1065,7 @@ linux_pwrite(td, uap) bsd.buf = uap->buf; bsd.nbyte = uap->nbyte; bsd.offset = uap->offset; - return pwrite(td, &bsd); + return sys_pwrite(td, &bsd); } int @@ -1163,7 +1163,7 @@ linux_umount(struct thread *td, struct l bsd.path = args->path; bsd.flags = args->flags; /* XXX correct? */ - return (unmount(td, &bsd)); + return (sys_unmount(td, &bsd)); } /* Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Fri Sep 16 12:13:03 2011 (r225616) +++ head/sys/compat/linux/linux_ioctl.c Fri Sep 16 13:58:51 2011 (r225617) @@ -803,7 +803,7 @@ linux_ioctl_termio(struct thread *td, st wr.fd = args->fd; wr.buf = &c; wr.nbyte = sizeof(c); - return (write(td, &wr)); + return (sys_write(td, &wr)); } else return (0); } @@ -812,7 +812,7 @@ linux_ioctl_termio(struct thread *td, st return (EINVAL); } args->arg = 0; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; } @@ -838,27 +838,27 @@ linux_ioctl_termio(struct thread *td, st case LINUX_TIOCEXCL: args->cmd = TIOCEXCL; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCNXCL: args->cmd = TIOCNXCL; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCSCTTY: args->cmd = TIOCSCTTY; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCGPGRP: args->cmd = TIOCGPGRP; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCSPGRP: args->cmd = TIOCSPGRP; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; /* LINUX_TIOCOUTQ */ @@ -866,32 +866,32 @@ linux_ioctl_termio(struct thread *td, st case LINUX_TIOCGWINSZ: args->cmd = TIOCGWINSZ; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCSWINSZ: args->cmd = TIOCSWINSZ; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCMGET: args->cmd = TIOCMGET; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCMBIS: args->cmd = TIOCMBIS; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCMBIC: args->cmd = TIOCMBIC; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCMSET: args->cmd = TIOCMSET; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; /* TIOCGSOFTCAR */ @@ -899,14 +899,14 @@ linux_ioctl_termio(struct thread *td, st case LINUX_FIONREAD: /* LINUX_TIOCINQ */ args->cmd = FIONREAD; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; /* LINUX_TIOCLINUX */ case LINUX_TIOCCONS: args->cmd = TIOCCONS; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCGSERIAL: { @@ -932,17 +932,17 @@ linux_ioctl_termio(struct thread *td, st case LINUX_TIOCPKT: args->cmd = TIOCPKT; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_FIONBIO: args->cmd = FIONBIO; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCNOTTY: args->cmd = TIOCNOTTY; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCSETD: { @@ -996,17 +996,17 @@ linux_ioctl_termio(struct thread *td, st case LINUX_FIONCLEX: args->cmd = FIONCLEX; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_FIOCLEX: args->cmd = FIOCLEX; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_FIOASYNC: args->cmd = FIOASYNC; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; /* LINUX_TIOCSERCONFIG */ @@ -1017,12 +1017,12 @@ linux_ioctl_termio(struct thread *td, st case LINUX_TIOCSBRK: args->cmd = TIOCSBRK; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCCBRK: args->cmd = TIOCCBRK; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_TIOCGPTN: { int nb; @@ -1447,22 +1447,22 @@ linux_ioctl_cdrom(struct thread *td, str case LINUX_CDROMPAUSE: args->cmd = CDIOCPAUSE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_CDROMRESUME: args->cmd = CDIOCRESUME; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_CDROMPLAYMSF: args->cmd = CDIOCPLAYMSF; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_CDROMPLAYTRKIND: args->cmd = CDIOCPLAYTRACKS; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_CDROMREADTOCHDR: { @@ -1501,17 +1501,17 @@ linux_ioctl_cdrom(struct thread *td, str case LINUX_CDROMSTOP: args->cmd = CDIOCSTOP; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_CDROMSTART: args->cmd = CDIOCSTART; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_CDROMEJECT: args->cmd = CDIOCEJECT; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; /* LINUX_CDROMVOLCTRL */ @@ -1555,7 +1555,7 @@ linux_ioctl_cdrom(struct thread *td, str case LINUX_CDROMRESET: args->cmd = CDIOCRESET; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; /* LINUX_CDROMVOLREAD */ @@ -1689,71 +1689,71 @@ linux_ioctl_sound(struct thread *td, str case LINUX_SOUND_MIXER_WRITE_VOLUME: args->cmd = SETDIR(SOUND_MIXER_WRITE_VOLUME); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_BASS: args->cmd = SETDIR(SOUND_MIXER_WRITE_BASS); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_TREBLE: args->cmd = SETDIR(SOUND_MIXER_WRITE_TREBLE); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_SYNTH: args->cmd = SETDIR(SOUND_MIXER_WRITE_SYNTH); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_PCM: args->cmd = SETDIR(SOUND_MIXER_WRITE_PCM); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_SPEAKER: args->cmd = SETDIR(SOUND_MIXER_WRITE_SPEAKER); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_LINE: args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_MIC: args->cmd = SETDIR(SOUND_MIXER_WRITE_MIC); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_CD: args->cmd = SETDIR(SOUND_MIXER_WRITE_CD); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_IMIX: args->cmd = SETDIR(SOUND_MIXER_WRITE_IMIX); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_ALTPCM: args->cmd = SETDIR(SOUND_MIXER_WRITE_ALTPCM); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_RECLEV: args->cmd = SETDIR(SOUND_MIXER_WRITE_RECLEV); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_IGAIN: args->cmd = SETDIR(SOUND_MIXER_WRITE_IGAIN); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_OGAIN: args->cmd = SETDIR(SOUND_MIXER_WRITE_OGAIN); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_LINE1: args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE1); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_LINE2: args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE2); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_LINE3: args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE3); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_INFO: { /* Key on encoded length */ @@ -1787,167 +1787,167 @@ linux_ioctl_sound(struct thread *td, str case LINUX_SOUND_MIXER_READ_STEREODEVS: args->cmd = SOUND_MIXER_READ_STEREODEVS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_READ_CAPS: args->cmd = SOUND_MIXER_READ_CAPS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_READ_RECMASK: args->cmd = SOUND_MIXER_READ_RECMASK; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_READ_DEVMASK: args->cmd = SOUND_MIXER_READ_DEVMASK; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_MIXER_WRITE_RECSRC: args->cmd = SETDIR(SOUND_MIXER_WRITE_RECSRC); - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_RESET: args->cmd = SNDCTL_DSP_RESET; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SYNC: args->cmd = SNDCTL_DSP_SYNC; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SPEED: args->cmd = SNDCTL_DSP_SPEED; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_STEREO: args->cmd = SNDCTL_DSP_STEREO; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETBLKSIZE: /* LINUX_SNDCTL_DSP_SETBLKSIZE */ args->cmd = SNDCTL_DSP_GETBLKSIZE; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SETFMT: args->cmd = SNDCTL_DSP_SETFMT; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_PCM_WRITE_CHANNELS: args->cmd = SOUND_PCM_WRITE_CHANNELS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SOUND_PCM_WRITE_FILTER: args->cmd = SOUND_PCM_WRITE_FILTER; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_POST: args->cmd = SNDCTL_DSP_POST; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SUBDIVIDE: args->cmd = SNDCTL_DSP_SUBDIVIDE; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SETFRAGMENT: args->cmd = SNDCTL_DSP_SETFRAGMENT; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETFMTS: args->cmd = SNDCTL_DSP_GETFMTS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETOSPACE: args->cmd = SNDCTL_DSP_GETOSPACE; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETISPACE: args->cmd = SNDCTL_DSP_GETISPACE; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_NONBLOCK: args->cmd = SNDCTL_DSP_NONBLOCK; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETCAPS: args->cmd = SNDCTL_DSP_GETCAPS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SETTRIGGER: /* LINUX_SNDCTL_GETTRIGGER */ args->cmd = SNDCTL_DSP_SETTRIGGER; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETIPTR: args->cmd = SNDCTL_DSP_GETIPTR; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETOPTR: args->cmd = SNDCTL_DSP_GETOPTR; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_SETDUPLEX: args->cmd = SNDCTL_DSP_SETDUPLEX; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_DSP_GETODELAY: args->cmd = SNDCTL_DSP_GETODELAY; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_RESET: args->cmd = SNDCTL_SEQ_RESET; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_SYNC: args->cmd = SNDCTL_SEQ_SYNC; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SYNTH_INFO: args->cmd = SNDCTL_SYNTH_INFO; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_CTRLRATE: args->cmd = SNDCTL_SEQ_CTRLRATE; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_GETOUTCOUNT: args->cmd = SNDCTL_SEQ_GETOUTCOUNT; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_GETINCOUNT: args->cmd = SNDCTL_SEQ_GETINCOUNT; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_PERCMODE: args->cmd = SNDCTL_SEQ_PERCMODE; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_FM_LOAD_INSTR: args->cmd = SNDCTL_FM_LOAD_INSTR; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_TESTMIDI: args->cmd = SNDCTL_SEQ_TESTMIDI; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_RESETSAMPLES: args->cmd = SNDCTL_SEQ_RESETSAMPLES; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_NRSYNTHS: args->cmd = SNDCTL_SEQ_NRSYNTHS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_NRMIDIS: args->cmd = SNDCTL_SEQ_NRMIDIS; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_MIDI_INFO: args->cmd = SNDCTL_MIDI_INFO; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SEQ_TRESHOLD: args->cmd = SNDCTL_SEQ_TRESHOLD; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); case LINUX_SNDCTL_SYNTH_MEMAVL: args->cmd = SNDCTL_SYNTH_MEMAVL; - return (ioctl(td, (struct ioctl_args *)args)); + return (sys_ioctl(td, (struct ioctl_args *)args)); } @@ -1972,37 +1972,37 @@ linux_ioctl_console(struct thread *td, s case LINUX_KIOCSOUND: args->cmd = KIOCSOUND; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDMKTONE: args->cmd = KDMKTONE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDGETLED: args->cmd = KDGETLED; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDSETLED: args->cmd = KDSETLED; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDSETMODE: args->cmd = KDSETMODE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDGETMODE: args->cmd = KDGETMODE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDGKBMODE: args->cmd = KDGKBMODE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_KDSKBMODE: { @@ -2028,12 +2028,12 @@ linux_ioctl_console(struct thread *td, s case LINUX_VT_OPENQRY: args->cmd = VT_OPENQRY; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_VT_GETMODE: args->cmd = VT_GETMODE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_VT_SETMODE: { @@ -2045,28 +2045,28 @@ linux_ioctl_console(struct thread *td, s if ((error = copyout(&mode, (void *)args->arg, sizeof(mode)))) break; args->cmd = VT_SETMODE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; } case LINUX_VT_GETSTATE: args->cmd = VT_GETACTIVE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_VT_RELDISP: args->cmd = VT_RELDISP; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_VT_ACTIVATE: args->cmd = VT_ACTIVATE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; case LINUX_VT_WAITACTIVE: args->cmd = VT_WAITACTIVE; - error = (ioctl(td, (struct ioctl_args *)args)); + error = (sys_ioctl(td, (struct ioctl_args *)args)); break; default: @@ -2440,27 +2440,27 @@ linux_ioctl_socket(struct thread *td, st *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109161358.p8GDwptH024793>