Index: kernel/arch/ia64/include/asm.h
===================================================================
--- kernel/arch/ia64/include/asm.h	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/include/asm.h	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -42,5 +42,5 @@
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 
-static inline void  outb(ioport_t port, uint8_t v)
+static inline void outb(ioport_t port, uint8_t v)
 {
 	*((uint8_t *)(IA64_IOSPACE_ADDRESS +
@@ -50,5 +50,5 @@
 }
 
-static inline void  outw(ioport_t port, uint16_t v)
+static inline void outw(ioport_t port, uint16_t v)
 {
 	*((uint16_t *)(IA64_IOSPACE_ADDRESS +
@@ -58,5 +58,5 @@
 }
 
-static inline void  outl(ioport_t port, uint32_t v)
+static inline void outl(ioport_t port, uint32_t v)
 {
 	*((uint32_t *)(IA64_IOSPACE_ADDRESS +
Index: kernel/arch/ia64/include/drivers/kbd.h
===================================================================
--- kernel/arch/ia64/include/drivers/kbd.h	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/include/drivers/kbd.h	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -36,10 +36,8 @@
 #define KERN_ia64_KBD_H_
 
-
-#define KBD_UNKNOWN 0
-#define	KBD_SKI 1
-#define	KBD_LEGACY 2
-#define	KBD_NS16550 3
-
+#define KBD_UNKNOWN  0
+#define KBD_SKI      1
+#define KBD_LEGACY   2
+#define KBD_NS16550  3
 
 #endif
Index: kernel/arch/ia64/include/fpu_context.h
===================================================================
--- kernel/arch/ia64/include/fpu_context.h	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/include/fpu_context.h	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -36,5 +36,4 @@
 #define KERN_ia64_FPU_CONTEXT_H_
 
-#define ARCH_HAS_FPU 1
 #define FPU_CONTEXT_ALIGN 16
 
Index: kernel/arch/ia64/include/interrupt.h
===================================================================
--- kernel/arch/ia64/include/interrupt.h	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/include/interrupt.h	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -154,4 +154,6 @@
 extern void disabled_fp_register(uint64_t vector, istate_t *istate);
 
+extern void trap_virtual_enable_irqs(uint16_t irqmask);
+
 #endif
 
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/src/ia64.c	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -133,7 +133,7 @@
 #ifdef SKI
 		ski_init_console();
-#else	
+#else
 		ega_init(EGA_BASE, EGA_VIDEORAM);
-#endif	
+#endif
 	}
 	it_init();
@@ -266,10 +266,10 @@
 #ifdef SKI
 	ski_kbd_release();
-#else	
+#else
 #ifdef CONFIG_NS16550
 	ns16550_release();
-#else	
+#else
 	i8042_release();
-#endif	
+#endif
 #endif
 }
@@ -282,4 +282,21 @@
 }
 
+/** 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)
+{
+	fptr->fnc = (unative_t) addr;
+	fptr->gp = ((unative_t *) caller)[1];
+	
+	return (void *) fptr;
+}
+
 /** @}
  */
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/src/interrupt.c	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -195,6 +195,6 @@
 void disabled_fp_register(uint64_t vector, istate_t *istate)
 {
-#ifdef CONFIG_FPU_LAZY 
-	scheduler_fpu_lazy_request();	
+#ifdef CONFIG_FPU_LAZY
+	scheduler_fpu_lazy_request();
 #else
 	fault_if_from_uspace(istate, "Interruption: %#hx (%s).",
@@ -302,4 +302,8 @@
 }
 
+void trap_virtual_enable_irqs(uint16_t irqmask)
+{
+}
+
 /** @}
  */
Index: kernel/arch/ia64/src/ski/ski.c
===================================================================
--- kernel/arch/ia64/src/ski/ski.c	(revision 70047478224039b394ba6d1a4ba25ae4fb58ab81)
+++ kernel/arch/ia64/src/ski/ski.c	(revision 84266669dc470a1e1af6b9662943b763a810e629)
@@ -47,5 +47,5 @@
 #include <arch/drivers/kbd.h>
 
-#define SKI_KBD_INR	0
+#define SKI_KBD_INR  0
 
 static irq_t ski_kbd_irq;
@@ -115,7 +115,7 @@
 {
 	int ch;
-
-	while(!(ch = ski_getchar()))
-		;
+	
+	while(!(ch = ski_getchar()));
+	
 	if (ch == '\r')
 		ch = '\n'; 
@@ -129,14 +129,14 @@
 	static char last; 
 	ipl_t ipl;
-
+	
 	ipl = interrupts_disable();
-
+	
 	if (kbd_disabled) {
 		interrupts_restore(ipl);
 		return;
 	}
-		
+	
 	spinlock_lock(&ski_kbd_irq.lock);
-
+	
 	ch = ski_getchar();
 	if(ch == '\r')
@@ -178,5 +178,5 @@
 static void ski_kbd_disable(chardev_t *d)
 {
-	kbd_disabled = true;	
+	kbd_disabled = true;
 }