Index: arch/amd64/include/asm.h
===================================================================
--- arch/amd64/include/asm.h	(revision fcfac420803a43318bce80248d718b848e2bcaa3)
+++ arch/amd64/include/asm.h	(revision f7f6f258f11ea7fa2e036886d7e08ce0072288a6)
@@ -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 f7f6f258f11ea7fa2e036886d7e08ce0072288a6)
+++ arch/amd64/include/debug.h	(revision f7f6f258f11ea7fa2e036886d7e08ce0072288a6)
@@ -0,0 +1,1 @@
+../../ia32/include/debug.h