emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

scratch/no-purespace 76330ffd560 01/11: Fixup: remove from "Pure storage


From: Pip Cet
Subject: scratch/no-purespace 76330ffd560 01/11: Fixup: remove from "Pure storage removal: Main part"
Date: Wed, 21 Aug 2024 05:57:04 -0400 (EDT)

branch: scratch/no-purespace
commit 76330ffd560655ecad0459c2e50edb8a4527fb3f
Author: Pip Cet <pipcet@protonmail.com>
Commit: Pip Cet <pipcet@protonmail.com>

    Fixup: remove from "Pure storage removal: Main part"
    
    This section was incorrectly included in commit "Pure storage removal:
    Main part", but belongs in commit "Unexec removal: Main part".
    
    Remove this line from the commit message for "Pure storage removal: Main
    part":
    
    (mmap_lisp_allowed_p): Remove unexec-specific code.
---
 src/alloc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/alloc.c b/src/alloc.c
index ffe68392c03..86ab0f89fc7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -586,8 +586,10 @@ mmap_lisp_allowed_p (void)
 {
   /* If we can't store all memory addresses in our lisp objects, it's
      risky to let the heap use mmap and give us addresses from all
-     over our address space.  */
-  return pointers_fit_in_lispobj_p ();
+     over our address space.  We also can't use mmap for lisp objects
+     if we might dump: unexec doesn't preserve the contents of mmapped
+     regions.  */
+  return pointers_fit_in_lispobj_p () && !will_dump_with_unexec_p ();
 }
 #endif
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]