X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=eb1a5a0931a069ee12b375c5261f042aa2398817;hb=80f222325e1f677e5cf8de01c6990906fa47f65d;hp=a958224f66593349db0fecfe1ba2dab66702d526;hpb=ce0a49644dce03ca07008e8073897e4ed7b247df;p=sbcl.git

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index a958224..eb1a5a0 100644
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -48,7 +48,7 @@
 size_t os_vm_page_size;
 
 #ifdef LISP_FEATURE_SB_FUTEX
-#include <asm/unistd.h>
+#include <linux/unistd.h>
 #include <errno.h>
 
 /* values taken from the kernel's linux/futex.h.  This header file
@@ -222,7 +222,7 @@ void
 sigsegv_handler(int signal, siginfo_t *info, void* void_context)
 {
     os_context_t *context = arch_os_get_context(&void_context);
-    void* fault_addr = (void*)context->uc_mcontext.cr2;
+    void* fault_addr = (void*)info->si_addr;
     if (!gencgc_handle_wp_violation(fault_addr)) 
 	if(!handle_control_stack_guard_triggered(context,fault_addr))
 	    interrupt_handle_now(signal, info, void_context);