X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=236a33e49252e22228c7339d174e6685c3c0e041;hb=7e24349c17298e2959e853ea411b5f65d9f7f332;hp=b57b300f279ea172d7de0fa48b4bf682ab8f7e8a;hpb=c97e05b47236081529c73981b7624e0e0bb98fad;p=sbcl.git

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index b57b300..236a33e 100644
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -62,7 +62,7 @@ int personality (unsigned long);
 
 size_t os_vm_page_size;
 
-#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX)
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
 #include <sys/syscall.h>
 #include <unistd.h>
 #include <errno.h>
@@ -88,13 +88,13 @@ futex_wait(int *lock_word, int oldval)
   again:
     t = sys_futex(lock_word,FUTEX_WAIT,oldval, 0);
 
-    /* Interrupted FUTEX_WAIT calls may return early. 
+    /* Interrupted FUTEX_WAIT calls may return early.
      *
      * If someone manages to wake the futex while we're spinning
      * around it, we will just return with -1 and errno EWOULDBLOCK,
      * because the value has changed, so that's ok. */
     if (t != 0 && errno == EINTR)
-	goto again;
+        goto again;
 
     return t;
 }
@@ -145,7 +145,7 @@ os_init(char *argv[], char *envp[])
 {
     /* Conduct various version checks: do we have enough mmap(), is
      * this a sparc running 2.2, can we do threads? */
-#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX)
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
     int *futex=0;
 #endif
     struct utsname name;
@@ -171,7 +171,7 @@ os_init(char *argv[], char *envp[])
 #endif
     }
 #ifdef LISP_FEATURE_SB_THREAD
-#if !defined(LISP_FEATURE_SB_LUTEX)
+#if !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
     futex_wait(futex,-1);
     if(errno==ENOSYS) {
        lose("This version of SBCL is compiled with threading support, but your kernel\n"
@@ -185,7 +185,12 @@ os_init(char *argv[], char *envp[])
             "LD_ASSUME_KERNEL\n");
     }
 #endif
-    os_vm_page_size = getpagesize();
+
+    /* Don't use getpagesize(), since it's not constant across Linux
+     * kernel versions on some architectures (for example PPC). FIXME:
+     * possibly the same should be done on other architectures too.
+     */
+    os_vm_page_size = BACKEND_PAGE_SIZE;
 
     /* KLUDGE: Disable memory randomization on new Linux kernels
      * by setting a personality flag and re-executing. (We need
@@ -384,11 +389,11 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 #ifdef LISP_FEATURE_GENCGC
     if (!gencgc_handle_wp_violation(addr))
 #else
-    if (!interrupt_maybe_gc(signal, info, context))
+    if (!cheneygc_handle_wp_violation(context, addr))
 #endif
         if (!handle_guard_page_triggered(context, addr))
 #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
-            arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
+            lisp_memory_fault_error(context, addr);
 #else
             interrupt_handle_now(signal, info, context);
 #endif