diff options
author | jhb <jhb@FreeBSD.org> | 2006-07-10 17:59:26 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2006-07-10 17:59:26 +0000 |
commit | 0e6d9ac511b86d776777249e8dbc52878edb3aa0 (patch) | |
tree | 01c80c988ddde02451cddc7d77f9a3e0a0f0f3d4 /sys/i386 | |
parent | 6139cbea69c3362168dcd5454533060657dfe430 (diff) | |
download | FreeBSD-src-0e6d9ac511b86d776777249e8dbc52878edb3aa0.zip FreeBSD-src-0e6d9ac511b86d776777249e8dbc52878edb3aa0.tar.gz |
Retire the stackgap macros from ibcs2 as they are no longer used. Push
the includes of <sys/exec.h> and <sys/sysent.h> down into the only files
that now need them.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/ibcs2/ibcs2_util.h | 32 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_xenix.c | 1 | ||||
-rw-r--r-- | sys/i386/ibcs2/imgact_coff.c | 1 |
3 files changed, 2 insertions, 32 deletions
diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h index bf2513e..be43fa6 100644 --- a/sys/i386/ibcs2/ibcs2_util.h +++ b/sys/i386/ibcs2/ibcs2_util.h @@ -40,41 +40,9 @@ #ifndef _IBCS2_UTIL_H_ #define _IBCS2_UTIL_H_ -/* - * XXX the inlines have obnoxious prerequisites, only some of which are - * included here. - */ -#include <vm/vm.h> -#include <vm/pmap.h> -#include <machine/vmparam.h> -#include <sys/exec.h> -#include <sys/sysent.h> #include <sys/proc.h> #include <sys/uio.h> -static __inline caddr_t stackgap_init(void); -static __inline void *stackgap_alloc(caddr_t *, size_t); - -static __inline caddr_t -stackgap_init() -{ -#define szsigcode (*(curthread->td_proc->p_sysent->sv_szsigcode)) - return (caddr_t)(PS_STRINGS - szsigcode - SPARE_USRSPACE); -} - -static __inline void * -stackgap_alloc(sgp, sz) - caddr_t *sgp; - size_t sz; -{ - void *p = (void *) *sgp; - sz = ALIGN(sz); - if (*sgp + sz > (caddr_t)(PS_STRINGS - szsigcode)) - return NULL; - *sgp += sz; - return p; -} - #ifdef DEBUG_IBCS2 #define DPRINTF(a) printf a; #else diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c index e3fbc04..33f0dda 100644 --- a/sys/i386/ibcs2/ibcs2_xenix.c +++ b/sys/i386/ibcs2/ibcs2_xenix.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/vnode.h> #include <sys/syscallsubr.h> #include <sys/sysctl.h> +#include <sys/sysent.h> #include <sys/unistd.h> #include <machine/cpu.h> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index a7ab607..c04fe83 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/exec.h> #include <sys/fcntl.h> #include <sys/imgact.h> #include <sys/kernel.h> |