From owner-p4-projects@FreeBSD.ORG  Wed Jul  5 21:03:12 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FADA16A4E0; Wed,  5 Jul 2006 21:03:12 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1D38016A4DD
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 21:03:12 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D919643D46
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 21:03:11 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65L3BLb059250
	for <perforce@freebsd.org>; Wed, 5 Jul 2006 21:03:11 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65L3BWv059247
	for perforce@freebsd.org; Wed, 5 Jul 2006 21:03:11 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 5 Jul 2006 21:03:11 GMT
Message-Id: <200607052103.k65L3BWv059247@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100656 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jul 2006 21:03:12 -0000

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>