From a3b0216d19e2451899cb4acc1a48fa63853ea943 Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Fri, 12 Aug 2005 13:40:48 +0000 Subject: [PATCH] 0.9.3.48: Don't set the MAP_FIXED flag for mmap on Linux. This allows us to give a reasonable error message when the areas we're trying to map are already reserved, instead of crashing due to overwriting them. (As suggested by James Knight on sbcl-devel, 2005-08-01). --- src/runtime/linux-os.c | 7 ++----- version.lisp-expr | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 5bed73a..25fd433 100644 --- a/src/runtime/linux-os.c +++ b/src/runtime/linux-os.c @@ -142,13 +142,10 @@ os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len) { int flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE; - os_vm_address_t actual ; + os_vm_address_t actual; - if (addr) - flags |= MAP_FIXED; #ifdef LISP_FEATURE_ALPHA - else { - flags |= MAP_FIXED; + if (!addr) { addr=under_2gb_free_pointer; } #endif diff --git a/version.lisp-expr b/version.lisp-expr index 050acb6..0ed0b23 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.3.47" +"0.9.3.48" -- 1.7.10.4