diff -ruN linux-2.6.12-rc2-mm2-mask.orig/arch/um/sys-x86_64/syscalls.c linux-2.6.12-rc2-mm2-mask/arch/um/sys-x86_64/syscalls.c
--- linux-2.6.12-rc2-mm2-mask.orig/arch/um/sys-x86_64/syscalls.c	2005-04-09 11:23:30.000000000 +0300
+++ linux-2.6.12-rc2-mm2-mask/arch/um/sys-x86_64/syscalls.c	2005-04-09 13:31:09.000000000 +0300
@@ -10,6 +10,7 @@
 #include "asm/uaccess.h"
 #define __FRAME_OFFSETS
 #include "asm/ptrace.h"
+#include "../include/skas_ptrace.h"
 #include "asm/unistd.h"
 #include "asm/prctl.h" /* XXX This should get the constants from libc */
 #include "choose-mode.h"
@@ -62,9 +63,14 @@
                 goto out;
         }
 
+        /*
 	ldt = ((struct ptrace_ldt) { .func	= func,
 				     .ptr	= buf,
 				     .bytecount = bytecount });
+             */
+        ldt.func = func;
+        ldt.ptr = buf;
+        ldt.bytecount = bytecount;
 #warning Need to look up userspace_pid by cpu
 	res = ptrace(PTRACE_LDT, userspace_pid[0], 0, (unsigned long) &ldt);
         if(res < 0)
Binary files linux-2.6.12-rc2-mm2-mask.orig/arch/um/sys-x86_64/util/mk_thread and linux-2.6.12-rc2-mm2-mask/arch/um/sys-x86_64/util/mk_thread differ
diff -ruN linux-2.6.12-rc2-mm2-mask.orig/include/asm-um/ipc.h linux-2.6.12-rc2-mm2-mask/include/asm-um/ipc.h
--- linux-2.6.12-rc2-mm2-mask.orig/include/asm-um/ipc.h	2003-12-18 04:59:42.000000000 +0200
+++ linux-2.6.12-rc2-mm2-mask/include/asm-um/ipc.h	2005-04-09 12:44:53.000000000 +0300
@@ -1,6 +1,6 @@
 #ifndef __UM_IPC_H
 #define __UM_IPC_H
 
-#include "asm/arch/ipc.h"
+#include "asm/ipc.h"
 
 #endif
diff -ruN linux-2.6.12-rc2-mm2-mask.orig/include/asm-um/processor-x86_64.h linux-2.6.12-rc2-mm2-mask/include/asm-um/processor-x86_64.h
--- linux-2.6.12-rc2-mm2-mask.orig/include/asm-um/processor-x86_64.h	2005-04-09 11:23:45.000000000 +0300
+++ linux-2.6.12-rc2-mm2-mask/include/asm-um/processor-x86_64.h	2005-04-09 12:34:08.000000000 +0300
@@ -10,6 +10,7 @@
 #include "asm/arch/user.h"
 
 struct arch_thread {
+  unsigned long debugregs[8];
 };
 
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */