From 4d9aeff51f5a22d2743d14fcc3579952006f3952 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 22 Aug 2005 01:15:07 +0000
Subject: [PATCH] Don't ever try MAP_FIXED unless we _know_ that the address
 range is available.

---
 v7/src/microcode/ux.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/v7/src/microcode/ux.c b/v7/src/microcode/ux.c
index bb9e7108c..a7691a6a0 100644
--- a/v7/src/microcode/ux.c
+++ b/v7/src/microcode/ux.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ux.c,v 1.26 2005/08/22 01:07:05 cph Exp $
+$Id: ux.c,v 1.27 2005/08/22 01:15:07 cph Exp $
 
 Copyright 1991,1992,1993,1996,1997,2000 Massachusetts Institute of Technology
 Copyright 2002,2003,2005 Massachusetts Institute of Technology
@@ -702,7 +702,7 @@ mmap_heap_malloc (unsigned long requested_length)
 				 (&search_result)))
     {
     case fsa_good_address:
-      result = (mmap_heap_malloc_1 (search_result, request, 1));
+      result = (mmap_heap_malloc_1 (search_result, request, true));
       break;
 
     case fsa_no_address:
@@ -710,10 +710,7 @@ mmap_heap_malloc (unsigned long requested_length)
       break;
 
     default:
-      result = (mmap_heap_malloc_1 (min_result, request, 1));
-      if (result == 0)
-	/* Can't get exact address; try for something nearby.  */
-	result = (mmap_heap_malloc_1 (min_result, request, 0));
+      result = (mmap_heap_malloc_1 (min_result, request, false));
       break;
     }
   if (result != 0)
-- 
2.25.1