projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.14.9:
[sbcl.git]
/
src
/
runtime
/
x86-linux-os.c
diff --git
a/src/runtime/x86-linux-os.c
b/src/runtime/x86-linux-os.c
index
b39df5a
..
15eb762
100644
(file)
--- a/
src/runtime/x86-linux-os.c
+++ b/
src/runtime/x86-linux-os.c
@@
-22,6
+22,7
@@
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
+#include "sbcl.h"
#include "./signal.h"
#include "os.h"
#include "arch.h"
#include "./signal.h"
#include "os.h"
#include "arch.h"
@@
-29,7
+30,6
@@
#include "interrupt.h"
#include "interr.h"
#include "lispregs.h"
#include "interrupt.h"
#include "interr.h"
#include "lispregs.h"
-#include "sbcl.h"
#include <sys/socket.h>
#include <sys/utsname.h>
#include <sys/socket.h>
#include <sys/utsname.h>
@@
-40,13
+40,12
@@
#include <sys/stat.h>
#include <unistd.h>
#include <asm/ldt.h>
#include <sys/stat.h>
#include <unistd.h>
#include <asm/ldt.h>
-#include "modify-ldt-struct-name.h"
#include <linux/unistd.h>
#include <sys/mman.h>
#include <linux/unistd.h>
#include <sys/mman.h>
+#include <linux/version.h>
#include "thread.h" /* dynamic_values_bytes */
#include "thread.h" /* dynamic_values_bytes */
-#ifndef MODIFY_LDT_STRUCT_NAMED_USER_DESC
-/* old glibc */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#define user_desc modify_ldt_ldt_s
#endif
#define user_desc modify_ldt_ldt_s
#endif
@@
-66,13
+65,13
@@
void debug_get_ldt()
printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
}
printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
}
-lispobj modify_ldt_lock; /* protect all calls to modify_ldt */
+volatile lispobj modify_ldt_lock; /* protect all calls to modify_ldt */
int arch_os_thread_init(struct thread *thread) {
stack_t sigstack;
#ifdef LISP_FEATURE_SB_THREAD
int arch_os_thread_init(struct thread *thread) {
stack_t sigstack;
#ifdef LISP_FEATURE_SB_THREAD
- /* this must be called from a function that has an exclusive lock
- * on all_threads
+ /* 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 */
*/
struct user_desc ldt_entry = {
1, 0, 0, /* index, address, length filled in later */