unifdef -DVM_STACK - it's been on for a while for x86 and was checked

and appeared to be working for the Alpha some time ago.

2 files changed, 2 insertions, 19 deletions

diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 7668454..4ba58ad 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.52 1999/01/26 02:38:10 julian Exp $
+ *  $Id: linux_misc.c,v 1.53 1999/03/02 00:28:07 julian Exp $
  */
 
 #include <sys/param.h>
@@ -669,21 +669,8 @@ linux_mmap(struct proc *p, struct linux_mmap_args *args)
 	bsd_args.flags |= MAP_FIXED;
     if (linux_args.flags & LINUX_MAP_ANON)
 	bsd_args.flags |= MAP_ANON;
-
-#ifndef VM_STACK
-    /* Linux Threads will map into the proc stack space, unless
-     * we prevent it.  This causes problems if we're not using
-     * our VM_STACK options.
-     */
-    if ((unsigned int)linux_args.addr + linux_args.len > (USRSTACK - MAXSSIZ))
-	return (EINVAL);
-#endif
-
     if (linux_args.flags & LINUX_MAP_GROWSDOWN) {
-
-#ifdef VM_STACK
 	bsd_args.flags |= MAP_STACK;      
-#endif
 
 	/* The linux MAP_GROWSDOWN option does not limit auto
 	 * growth of the region.  Linux mmap with this option
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 744719c..d3a2f71 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.44 1999/01/17 20:36:14 peter Exp $
+ *  $Id: linux_sysvec.c,v 1.45 1999/02/04 21:20:13 newton Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -217,11 +217,7 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
 	 *	and the stack can not be grown. useracc will return FALSE
 	 *	if access is denied.
 	 */
-#ifdef VM_STACK
 	if ((grow_stack (p, (int)fp) == FALSE) ||
-#else
-	if ((grow(p, (int)fp) == FALSE) ||
-#endif 
 	    (useracc((caddr_t)fp, sizeof (struct linux_sigframe), B_WRITE) == FALSE)) {
 		/*
 		 * Process has trashed its stack; give it an illegal