Date: Wed, 5 Jul 2006 21:03:11 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 100656 for review Message-ID: <200607052103.k65L3BWv059247@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100656 Change 100656 by jhb@jhb_mutex on 2006/07/05 21:02:27 Axe stackgap macros from ibcs2 and trim nested includes. Affected files ... .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.h#8 edit .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#16 edit .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#21 edit Differences ... ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.h#8 (text+ko) ==== @@ -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 ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#16 (text+ko) ==== @@ -42,6 +42,7 @@ #include <sys/vnode.h> #include <sys/syscallsubr.h> #include <sys/sysctl.h> +#include <sys/sysent.h> #include <sys/unistd.h> #include <machine/cpu.h> ==== //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#21 (text+ko) ==== @@ -32,6 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/exec.h> #include <sys/fcntl.h> #include <sys/imgact.h> #include <sys/kernel.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607052103.k65L3BWv059247>