Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/amd64/src/amd64.c	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -227,4 +227,18 @@
 }
 
+/** Construct function pointer
+ *
+ * @param fptr   function pointer structure
+ * @param addr   function address
+ * @param caller calling function address
+ *
+ * @return address of the function pointer
+ *
+ */
+void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller)
+{
+	return addr;
+}
+
 /** @}
  */
Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/amd64/src/debugger.c	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -205,5 +205,5 @@
 	/* Send IPI */
 #ifdef CONFIG_SMP
-//	ipi_broadcast(VECTOR_DEBUG_IPI);	
+//	ipi_broadcast(VECTOR_DEBUG_IPI);
 #endif	
 
@@ -211,8 +211,8 @@
 }
 
-#ifdef amd64
-#	define getip(x)	((x)->rip)
+#ifdef __64_BITS__
+	#define getip(x)  ((x)->rip)
 #else
-#	define getip(x)	((x)->eip)
+	#define getip(x)  ((x)->eip)
 #endif
 
@@ -277,5 +277,5 @@
 	
 	/* Set RF to restart the instruction  */
-#ifdef amd64       
+#ifdef __64_BITS__
 	istate->rflags |= RFLAGS_RF;
 #else
@@ -349,5 +349,5 @@
 	char *symbol;
 
-#ifdef __32_BITS__	
+#ifdef __32_BITS__
 	printf("#  Count Address    In symbol\n");
 	printf("-- ----- ---------- ---------\n");
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/amd64/src/interrupt.c	(revision 98a4e76b4160ea2db9e82981125a143f0b747421)
@@ -143,5 +143,5 @@
 static void nm_fault(int n, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY     
+#ifdef CONFIG_FPU_LAZY
 	scheduler_fpu_lazy_request();
 #else