diff -u -w -r1.25 Darwin-os.c
--- cmucl/src/lisp/Darwin-os.c	6 Jan 2009 00:06:46 -0000	1.25
+++ cmucl/src/lisp/Darwin-os.c	1 Feb 2010 08:58:26 -0000
@@ -101,7 +101,7 @@
 
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = OS_VM_DEFAULT_PAGESIZE;
 #ifdef __ppc__
diff -u -w -r1.31 FreeBSD-os.c
--- cmucl/src/lisp/FreeBSD-os.c	15 Oct 2009 15:05:51 -0000	1.31
+++ cmucl/src/lisp/FreeBSD-os.c	1 Feb 2010 08:58:26 -0000
@@ -39,7 +39,7 @@
 vm_size_t os_vm_page_size;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = getpagesize();
 }
diff -u -w -r1.46 Linux-os.c
--- cmucl/src/lisp/Linux-os.c	2 Nov 2009 15:05:07 -0000	1.46
+++ cmucl/src/lisp/Linux-os.c	1 Feb 2010 08:58:26 -0000
@@ -51,8 +51,88 @@
 #include "gencgc.h"
 #endif
 
+
+#if defined(__i386) || defined(__x86_64)
+/* Prototype for personality(2). Done inline here since the header file
+ * for this isn't available on old versions of glibc. */
+int personality (unsigned long);
+
+#if !defined(ADDR_NO_RANDOMIZE)
+#define ADDR_NO_RANDOMIZE 0x40000
+#endif
+/* From personality(2) */
+#define CURRENT_PERSONALITY 0xffffffffUL
+#endif
+
 void
-os_init(void)
+check_personality(struct utsname *name, char *argv[], char *envp[])
+{
+    /* KLUDGE: Disable memory randomization on new Linux kernels
+     * by setting a personality flag and re-executing. (We need
+     * to re-execute, since the memory maps that can conflict with
+     * the CMUCL spaces have already been done at this point).
+     *
+     * Since randomization is currently implemented only on x86 kernels,
+     * don't do this trick on other platforms.
+     */
+#if defined(__i386) || defined(__x86_64)
+    int major_version, minor_version, patch_version;
+    char *p;
+    p=name->release;
+    major_version=atoi(p);
+    p=strchr(p,'.')+1;
+    minor_version=atoi(p);
+    p=strchr(p,'.')+1;
+    patch_version=atoi(p);
+
+    if ((major_version == 2
+         /* Some old kernels will apparently lose unsupported personality flags
+          * on exec() */
+         && ((minor_version == 6 && patch_version >= 11)
+             || (minor_version > 6)
+             /* This is what RHEL 3 reports */
+             || (minor_version == 4 && patch_version > 20)))
+        || major_version >= 3)
+    {
+        int pers = personality(CURRENT_PERSONALITY);
+        if (!(pers & ADDR_NO_RANDOMIZE)) {
+            int retval = personality(pers | ADDR_NO_RANDOMIZE);
+            /* Allegedly some Linux kernels (the reported case was
+             * "hardened Linux 2.6.7") won't set the new personality,
+             * but nor will they return -1 for an error. So as a
+             * workaround query the new personality...
+             */
+            int newpers = personality(CURRENT_PERSONALITY);
+            /* ... and don't re-execute if either the setting resulted
+             * in an error or if the value didn't change. Otherwise
+             * this might result in an infinite loop.
+             */
+            if (retval != -1 && newpers != pers) {
+                /* Use /proc/self/exe instead of trying to figure out
+                 * the executable path from PATH and argv[0], since
+                 * that's unreliable. We follow the symlink instead of
+                 * executing the file directly in order to prevent top
+                 * from displaying the name of the process as "exe". */
+                char runtime[PATH_MAX+1];
+                int i = readlink("/proc/self/exe", runtime, PATH_MAX);
+                if (i != -1) {
+                    runtime[i] = '\0';
+                    execve(runtime, argv, envp);
+                }
+            }
+            /* Either changing the personality or execve() failed. Either
+             * way we might as well continue, and hope that the random
+             * memory maps are ok this time around.
+             */
+            fprintf(stderr, "WARNING: Couldn't re-execute CMUCL with the proper personality flags"
+                            "(maybe /proc isn't mounted?). Trying to continue anyway.\n");
+        }
+    }
+#endif
+}
+
+void
+os_init(char *argv[], char *envp[])
 {
     struct utsname name;
 
@@ -66,6 +146,8 @@
     }
 
     os_vm_page_size = getpagesize();
+
+    check_personality(&name, argv, envp);
 }
 
 #ifdef __i386
diff -u -w -r1.13 NetBSD-os.c
--- cmucl/src/lisp/NetBSD-os.c	16 Oct 2009 13:38:02 -0000	1.13
+++ cmucl/src/lisp/NetBSD-os.c	1 Feb 2010 08:58:26 -0000
@@ -45,7 +45,7 @@
 
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = OS_VM_DEFAULT_PAGESIZE;
 }
diff -u -w -r1.8 OpenBSD-os.c
--- cmucl/src/lisp/OpenBSD-os.c	7 Dec 2008 02:33:55 -0000	1.8
+++ cmucl/src/lisp/OpenBSD-os.c	1 Feb 2010 08:58:26 -0000
@@ -41,7 +41,7 @@
 
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = OS_VM_DEFAULT_PAGESIZE;
 }
diff -u -w -r1.8 hpux-os.c
--- cmucl/src/lisp/hpux-os.c	19 Mar 2008 09:17:10 -0000	1.8
+++ cmucl/src/lisp/hpux-os.c	1 Feb 2010 08:58:26 -0000
@@ -53,7 +53,7 @@
 } segments[MAX_SEGMENTS];
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     int i;
 
diff -u -w -r1.4 irix-os.c
--- cmucl/src/lisp/irix-os.c	19 Mar 2008 09:17:10 -0000	1.4
+++ cmucl/src/lisp/irix-os.c	1 Feb 2010 08:58:26 -0000
@@ -30,7 +30,7 @@
 int zero_fd;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     zero_fd = open("/dev/zero", O_RDONLY);
     os_vm_page_size = getpagesize();
diff -u -w -r1.69 lisp.c
--- cmucl/src/lisp/lisp.c	18 Dec 2009 04:03:24 -0000	1.69
+++ cmucl/src/lisp/lisp.c	1 Feb 2010 08:58:26 -0000
@@ -556,7 +556,7 @@
     if (default_core == NULL)
 	default_core = "lisp.core";
 
-    os_init();
+    os_init(argv, envp);
 #if defined FEATURE_EXECUTABLE
     if (builtin_image_flag != 0)
 	map_core_sections(argv[0]);
diff -u -w -r1.6 mach-os.c
--- cmucl/src/lisp/mach-os.c	19 Mar 2008 09:17:13 -0000	1.6
+++ cmucl/src/lisp/mach-os.c	1 Feb 2010 08:58:26 -0000
@@ -38,7 +38,7 @@
 #endif
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     os_vm_page_size = vm_page_size;
 }
diff -u -w -r1.23 os.h
--- cmucl/src/lisp/os.h	10 Dec 2008 02:39:13 -0000	1.23
+++ cmucl/src/lisp/os.h	1 Feb 2010 08:58:26 -0000
@@ -72,7 +72,7 @@
 
 extern os_vm_size_t os_vm_page_size;
 
-extern void os_init(void);
+extern void os_init(char *argv[], char *envp[]);
 extern void os_install_interrupt_handlers(void);
 
 extern os_vm_address_t os_allocate(os_vm_size_t len);
diff -u -w -r1.4 osf1-os.c
--- cmucl/src/lisp/osf1-os.c	19 Mar 2008 09:17:13 -0000	1.4
+++ cmucl/src/lisp/osf1-os.c	1 Feb 2010 08:58:26 -0000
@@ -26,7 +26,7 @@
 vm_size_t os_vm_page_size;
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     int buf[2] = { SSIN_UACPROC, UAC_SIGBUS | UAC_NOPRINT };
     int error;
diff -u -w -r1.23 solaris-os.c
--- cmucl/src/lisp/solaris-os.c	24 Sep 2008 09:42:33 -0000	1.23
+++ cmucl/src/lisp/solaris-os.c	1 Feb 2010 08:58:26 -0000
@@ -71,7 +71,7 @@
 }
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     zero_fd = open(ZEROFILE, O_RDONLY);
     if (zero_fd < 0)
diff -u -w -r1.10 sunos-os.c
--- cmucl/src/lisp/sunos-os.c	7 Sep 2008 07:07:49 -0000	1.10
+++ cmucl/src/lisp/sunos-os.c	1 Feb 2010 08:58:26 -0000
@@ -81,7 +81,7 @@
 }
 
 void
-os_init(void)
+os_init(char *argv[], char *envp[])
 {
     char *empty_file = getenv("CMUCL_EMPTYFILE");