diff options
author | kmacy <kmacy@FreeBSD.org> | 2011-09-16 13:58:51 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2011-09-16 13:58:51 +0000 |
commit | 99851f359e6f006b3223bb37dbc49e751ca8c13a (patch) | |
tree | 2ed8c1cfa9e408c1c66c2cde0823123897e0306e /sys/kern/kern_jail.c | |
parent | bf8fedabcd023c90bb2ee4ce0e5d6d8c2b927714 (diff) | |
download | FreeBSD-src-99851f359e6f006b3223bb37dbc49e751ca8c13a.zip FreeBSD-src-99851f359e6f006b3223bb37dbc49e751ca8c13a.tar.gz |
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)
Diffstat (limited to 'sys/kern/kern_jail.c')
-rw-r--r-- | sys/kern/kern_jail.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 8ce8327..37a2c59 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -276,7 +276,7 @@ qcmp_v6(const void *ip1, const void *ip2) * }; */ int -jail(struct thread *td, struct jail_args *uap) +sys_jail(struct thread *td, struct jail_args *uap) { uint32_t version; int error; @@ -489,7 +489,7 @@ kern_jail(struct thread *td, struct jail *j) * }; */ int -jail_set(struct thread *td, struct jail_set_args *uap) +sys_jail_set(struct thread *td, struct jail_set_args *uap) { struct uio *auio; int error; @@ -1819,7 +1819,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) * }; */ int -jail_get(struct thread *td, struct jail_get_args *uap) +sys_jail_get(struct thread *td, struct jail_get_args *uap) { struct uio *auio; int error; @@ -2119,7 +2119,7 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) * }; */ int -jail_remove(struct thread *td, struct jail_remove_args *uap) +sys_jail_remove(struct thread *td, struct jail_remove_args *uap) { struct prison *pr, *cpr, *lpr, *tpr; int descend, error; @@ -2206,7 +2206,7 @@ prison_remove_one(struct prison *pr) PROC_LOCK(p); if (p->p_state != PRS_NEW && p->p_ucred && p->p_ucred->cr_prison == pr) - psignal(p, SIGKILL); + kern_psignal(p, SIGKILL); PROC_UNLOCK(p); } sx_sunlock(&allproc_lock); @@ -2221,7 +2221,7 @@ prison_remove_one(struct prison *pr) * }; */ int -jail_attach(struct thread *td, struct jail_attach_args *uap) +sys_jail_attach(struct thread *td, struct jail_attach_args *uap) { struct prison *pr; int error; |