Index: arch/amd64/include/asm.h
===================================================================
--- arch/amd64/include/asm.h	(revision b00fdde560b3ef069ecb5aed3e0f1e04f21fe28a)
+++ arch/amd64/include/asm.h	(revision e8a9dc377795653528971e5e91a41ab7edea3ae2)
@@ -218,4 +218,16 @@
 }
 
+static inline __address * get_ip() 
+{
+	__address *ip;
+
+	__asm__ volatile (
+		"mov %%rip, %0"
+		: "=r" (ip)
+		);
+	return ip;
+}
+
+
 extern size_t interrupt_handler_size;
 extern void interrupt_handlers(void);
Index: arch/amd64/include/debug.h
===================================================================
--- arch/amd64/include/debug.h	(revision e8a9dc377795653528971e5e91a41ab7edea3ae2)
+++ arch/amd64/include/debug.h	(revision e8a9dc377795653528971e5e91a41ab7edea3ae2)
@@ -0,0 +1,1 @@
+../../ia32/include/debug.h