X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-linux-os.c;h=d68e964745072ba60b5e35cf080c7b9607037048;hb=afb952a15b893beccbc7750ebdc0ee403459fe28;hp=b0615dee8ae7e9c7f64974f245441ff116ad7270;hpb=426bde0954ef91387b8ab0d4528fad9ec02fa24c;p=sbcl.git

diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c
index b0615de..d68e964 100644
--- a/src/runtime/x86-linux-os.c
+++ b/src/runtime/x86-linux-os.c
@@ -40,7 +40,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <asm/ldt.h>
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 #include <sys/mman.h>
 #include <linux/version.h>
 #include "thread.h"             /* dynamic_values_bytes */
@@ -49,7 +49,11 @@
 #define user_desc  modify_ldt_ldt_s
 #endif
 
-_syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
+#define modify_ldt sbcl_modify_ldt
+static inline int modify_ldt (int func, void *ptr, unsigned long bytecount)
+{
+  return syscall (SYS_modify_ldt, func, ptr, bytecount);
+}
 
 #include "validate.h"
 size_t os_vm_page_size;
@@ -65,20 +69,19 @@ void debug_get_ldt()
     printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
 }
 
-volatile lispobj modify_ldt_lock;       /* protect all calls to modify_ldt */
+#ifdef LISP_FEATURE_SB_THREAD
+pthread_mutex_t modify_ldt_lock = PTHREAD_MUTEX_INITIALIZER;
+#endif
 
 int arch_os_thread_init(struct thread *thread) {
     stack_t sigstack;
 #ifdef LISP_FEATURE_SB_THREAD
-    /* FIXME Lock ordering rules: all_threads_lock must usually be
-     * held when getting modify_ldt_lock
-     */
     struct user_desc ldt_entry = {
         1, 0, 0, /* index, address, length filled in later */
         1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1
     };
     int n;
-    get_spinlock(&modify_ldt_lock,(long)thread);
+    thread_mutex_lock(&modify_ldt_lock);
     n=modify_ldt(0,local_ldt_copy,sizeof local_ldt_copy);
     /* get next free ldt entry */
 
@@ -92,16 +95,16 @@ int arch_os_thread_init(struct thread *thread) {
     ldt_entry.limit=dynamic_values_bytes;
     ldt_entry.limit_in_pages=0;
     if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) {
-        modify_ldt_lock=0;
+        thread_mutex_unlock(&modify_ldt_lock);
         /* modify_ldt call failed: something magical is not happening */
-        return -1;
+        return 0;
     }
     __asm__ __volatile__ ("movw %w0, %%fs" : : "q"
                           ((n << 3) /* selector number */
                            + (1 << 2) /* TI set = LDT */
                            + 3)); /* privilege level */
     thread->tls_cookie=n;
-    modify_ldt_lock=0;
+    pthread_mutex_unlock(&modify_ldt_lock);
 
     if(n<0) return 0;
     pthread_setspecific(specials,thread);
@@ -113,10 +116,8 @@ int arch_os_thread_init(struct thread *thread) {
     sigstack.ss_sp=((void *) thread)+dynamic_values_bytes;
     sigstack.ss_flags=0;
     sigstack.ss_size = 32*SIGSTKSZ;
-    sigaltstack(&sigstack,0);
-    if(sigaltstack(&sigstack,0)<0) {
+    if(sigaltstack(&sigstack,0)<0)
         lose("Cannot sigaltstack: %s\n",strerror(errno));
-    }
 #endif
     return 1;
 }
@@ -136,16 +137,13 @@ int arch_os_thread_cleanup(struct thread *thread) {
         0, 0, 0,
         0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0
     };
+    int result;
 
     ldt_entry.entry_number=thread->tls_cookie;
-    get_spinlock(&modify_ldt_lock,(long)thread);
-    if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) {
-        modify_ldt_lock=0;
-        /* modify_ldt call failed: something magical is not happening */
-        return 0;
-    }
-    modify_ldt_lock=0;
-    return 1;
+    thread_mutex_lock(&modify_ldt_lock);
+    result = modify_ldt(1, &ldt_entry, sizeof (ldt_entry));
+    thread_mutex_unlock(&modify_ldt_lock);
+    return result;
 }