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/ia64 | |
| 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/ia64')
| -rw-r--r-- | sys/ia64/ia32/ia32_signal.c | 4 | ||||
| -rw-r--r-- | sys/ia64/ia64/machdep.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/ia64/ia32/ia32_signal.c b/sys/ia64/ia32/ia32_signal.c index b8dab90..a3d4ace 100644 --- a/sys/ia64/ia32/ia32_signal.c +++ b/sys/ia64/ia32/ia32_signal.c @@ -117,14 +117,14 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) int freebsd4_freebsd32_sigreturn(struct thread *td, struct freebsd4_freebsd32_sigreturn_args *uap) { - return (sigreturn(td, (struct sigreturn_args *)uap)); + return (sys_sigreturn(td, (struct sigreturn_args *)uap)); } #endif int freebsd32_sigreturn(struct thread *td, struct freebsd32_sigreturn_args *uap) { - return (sigreturn(td, (struct sigreturn_args *)uap)); + return (sys_sigreturn(td, (struct sigreturn_args *)uap)); } diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 2bfd62e..2e14a2e 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -1155,7 +1155,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) * MPSAFE */ int -sigreturn(struct thread *td, +sys_sigreturn(struct thread *td, struct sigreturn_args /* { ucontext_t *sigcntxp; } */ *uap) @@ -1192,7 +1192,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 |
