Index: kernel/arch/ia64/include/asm.h
===================================================================
--- kernel/arch/ia64/include/asm.h	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/arch/ia64/include/asm.h	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -40,8 +40,9 @@
 #include <arch/register.h>
 
+typedef uint64_t ioport_t;
 
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 
-static inline void  outb(uint64_t port,uint8_t v)
+static inline void  outb(ioport_t port,uint8_t v)
 {
 	*((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
@@ -50,5 +51,5 @@
 }
 
-static inline void  outw(uint64_t port,uint16_t v)
+static inline void  outw(ioport_t port,uint16_t v)
 {
 	*((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
@@ -57,5 +58,5 @@
 }
 
-static inline void  outl(uint64_t port,uint32_t v)
+static inline void  outl(ioport_t port,uint32_t v)
 {
 	*((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
@@ -66,5 +67,5 @@
 
 
-static inline uint8_t inb(uint64_t port)
+static inline uint8_t inb(ioport_t port)
 {
 	asm volatile ("mf\n" ::: "memory");
@@ -73,5 +74,5 @@
 }
 
-static inline uint16_t inw(uint64_t port)
+static inline uint16_t inw(ioport_t port)
 {
 	asm volatile ("mf\n" ::: "memory");
@@ -80,5 +81,5 @@
 }
 
-static inline uint32_t inl(uint64_t port)
+static inline uint32_t inl(ioport_t port)
 {
 	asm volatile ("mf\n" ::: "memory");
@@ -99,7 +100,12 @@
 	uint64_t v;
 
-	asm volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
-	
-	return v;
+	//I'm not sure why but this code bad inlines in scheduler, 
+	//so THE shifts about 16B and causes kernel panic
+	//asm volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
+	//return v;
+	
+	//this code have the same meaning but inlines well
+	asm volatile ("mov %0 = r12" : "=r" (v)  );
+	return v & (~(STACK_SIZE-1));
 }
 
@@ -152,4 +158,14 @@
 	return v;
 }
+
+static inline uint64_t cr64_read(void)
+{
+	uint64_t v;
+	
+	asm volatile ("mov %0 = cr64\n" : "=r" (v));
+	
+	return v;
+}
+
 
 /** Write ITC (Interval Timer Counter) register.
Index: kernel/arch/sparc64/include/asm.h
===================================================================
--- kernel/arch/sparc64/include/asm.h	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/arch/sparc64/include/asm.h	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -44,4 +44,43 @@
 #include <arch/stack.h>
 
+typedef uint64_t ioport_t;
+
+
+static inline void  outb(ioport_t port,uint8_t v)
+{
+	*((uint8_t *)(port)) = v;
+}
+
+static inline void  outw(ioport_t port,uint16_t v)
+{
+	*((uint16_t *)(port)) = v;
+}
+
+static inline void  outl(ioport_t port,uint32_t v)
+{
+	*((uint32_t *)(port)) = v;
+}
+
+
+
+static inline uint8_t inb(ioport_t port)
+{
+	return *((uint8_t *)(port));
+}
+
+static inline uint16_t inw(ioport_t port)
+{
+	return *((uint16_t *)(port));
+}
+
+static inline uint32_t inl(ioport_t port)
+{
+	return *((uint32_t *)(port));
+}
+
+
+
+
+
 /** Read Processor State register.
  *
Index: kernel/arch/sparc64/include/drivers/ns16550.h
===================================================================
--- kernel/arch/sparc64/include/drivers/ns16550.h	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/arch/sparc64/include/drivers/ns16550.h	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -36,64 +36,4 @@
 #define KERN_sparc64_NS16550_H_
 
-#include <arch/types.h>
-#include <arch/drivers/kbd.h>
-
-/* NS16550 registers */
-#define RBR_REG		0	/** Receiver Buffer Register. */
-#define IER_REG		1	/** Interrupt Enable Register. */
-#define IIR_REG		2	/** Interrupt Ident Register (read). */
-#define FCR_REG		2	/** FIFO control register (write). */
-#define LCR_REG		3	/** Line Control register. */
-#define LSR_REG		5	/** Line Status Register. */
-
-#define IER_ERBFI	0x01	/** Enable Receive Buffer Full Interrupt. */
-
-#define LCR_DLAB	0x80	/** Divisor Latch Access bit. */
-
-/** Structure representing the ns16550 device. */
-typedef struct {
-	devno_t devno;
-	volatile uint8_t *reg;	/** Memory mapped registers of the ns16550. */
-} ns16550_t;
-
-static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
-{
-	return dev->reg[RBR_REG];
-}
-
-static inline uint8_t ns16550_ier_read(ns16550_t *dev)
-{
-	return dev->reg[IER_REG];
-}
-
-static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
-{
-	dev->reg[IER_REG] = v;
-}
-
-static inline uint8_t ns16550_iir_read(ns16550_t *dev)
-{
-	return dev->reg[IIR_REG];
-}
-
-static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
-{
-	dev->reg[FCR_REG] = v;
-}
-
-static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
-{
-	return dev->reg[LCR_REG];
-}
-
-static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
-{
-	dev->reg[LCR_REG] = v;
-}
-
-static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
-{
-	return dev->reg[LSR_REG];
-}
 
 #endif
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -148,5 +148,5 @@
 #ifdef CONFIG_NS16550
 	case KBD_NS16550:
-		ns16550_init(devno, inr, vaddr);
+		ns16550_init(devno, inr, (ioport_t)vaddr);
 		break;
 #endif
Index: kernel/genarch/include/kbd/ns16550.h
===================================================================
--- kernel/genarch/include/kbd/ns16550.h	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/genarch/include/kbd/ns16550.h	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -49,4 +49,72 @@
 extern void ns16550_irq_handler(irq_t *irq, void *arg, ...);
 
+#include <arch/types.h>
+#ifndef ia64
+#include <arch/drivers/kbd.h>
+#endif
+/* NS16550 registers */
+#define RBR_REG		0	/** Receiver Buffer Register. */
+#define IER_REG		1	/** Interrupt Enable Register. */
+#define IIR_REG		2	/** Interrupt Ident Register (read). */
+#define FCR_REG		2	/** FIFO control register (write). */
+#define LCR_REG		3	/** Line Control register. */
+#define LSR_REG		5	/** Line Status Register. */
+
+#define IER_ERBFI	0x01	/** Enable Receive Buffer Full Interrupt. */
+
+#define LCR_DLAB	0x80	/** Divisor Latch Access bit. */
+
+/** Structure representing the ns16550 device. */
+typedef struct {
+	devno_t devno;
+	volatile ioport_t io_port;	/** Memory mapped registers of the ns16550. */
+} ns16550_t;
+
+static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
+{
+	return inb(dev->io_port+RBR_REG);
+}
+static inline void ns16550_rbr_write(ns16550_t *dev, uint8_t v)
+{
+	outb(dev->io_port+RBR_REG,v);
+}
+
+static inline uint8_t ns16550_ier_read(ns16550_t *dev)
+{
+	return inb(dev->io_port+IER_REG);
+}
+
+static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
+{
+	outb(dev->io_port+IER_REG,v);
+}
+
+static inline uint8_t ns16550_iir_read(ns16550_t *dev)
+{
+	return inb(dev->io_port+IIR_REG);
+}
+
+static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
+{
+	outb(dev->io_port+FCR_REG,v);
+}
+
+static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
+{
+	return inb(dev->io_port+LCR_REG);
+}
+
+static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
+{
+	outb(dev->io_port+LCR_REG,v);
+}
+
+static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
+{
+	return inb(dev->io_port+LSR_REG);
+}
+
+
+
 #endif
 
Index: kernel/genarch/src/kbd/key.c
===================================================================
--- kernel/genarch/src/kbd/key.c	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/genarch/src/kbd/key.c	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -40,7 +40,11 @@
 #include <genarch/kbd/scanc_pc.h>
 #endif
+
+#if (defined(sparc64))
 #if (defined(CONFIG_Z8530) || defined(CONFIG_NS16550))
 #include <genarch/kbd/scanc_sun.h>
 #endif
+#endif
+
 #include <synch/spinlock.h>
 #include <console/chardev.h>
Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/genarch/src/kbd/ns16550.c	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -39,6 +39,8 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
+#ifndef ia64
 #include <arch/drivers/kbd.h>
 #include <arch/drivers/ns16550.h>
+#endif
 #include <ddi/irq.h>
 #include <ipc/irq.h>
@@ -110,5 +112,5 @@
  * @param vaddr Virtual address of device's registers.
  */
-void ns16550_init(devno_t devno, inr_t inr, uintptr_t vaddr)
+void ns16550_init(devno_t devno, inr_t inr, ioport_t port)
 {
 	chardev_initialize("ns16550_kbd", &kbrd, &ops);
@@ -116,5 +118,5 @@
 	
 	ns16550.devno = devno;
-	ns16550.reg = (uint8_t *) vaddr;
+	ns16550.io_port = port;
 	
 	irq_initialize(&ns16550_irq);
@@ -126,8 +128,19 @@
 	
 	sysinfo_set_item_val("kbd", NULL, true);
+#ifndef ia64
 	sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
+#endif
 	sysinfo_set_item_val("kbd.devno", NULL, devno);
 	sysinfo_set_item_val("kbd.inr", NULL, inr);
-	sysinfo_set_item_val("kbd.address.virtual", NULL, vaddr);
+	sysinfo_set_item_val("kbd.address.virtual", NULL, port);
+
+#ifdef ia64
+    	uint8_t c;
+    	c=ns16550_lcr_read(&ns16550);
+    	ns16550_lcr_write(&ns16550,0x80|c);
+    	ns16550_rbr_write(&ns16550,0x0c);
+    	ns16550_ier_write(&ns16550,0x00);
+    	ns16550_lcr_write(&ns16550,c);
+#endif
 	
 	ns16550_grab();
@@ -152,4 +165,5 @@
 {
 }
+
 
 char ns16550_key_read(chardev_t *d)
@@ -162,4 +176,5 @@
 			;
 		x = ns16550_rbr_read(&ns16550);
+#ifndef ia64
 		if (x != IGNORE_CODE) {
 			if (x & KEY_RELEASE)
@@ -168,4 +183,13 @@
 				active_read_key_pressed(x);
 		}
+#else
+	extern chardev_t kbrd;
+	if(x!=0x0d)
+	{
+	    if(x==0x7f) x='\b';
+	    chardev_push_character(&kbrd,x);
+	}    
+#endif		
+
 	}
 	return ch;
@@ -202,4 +226,5 @@
 		
 		x = ns16550_rbr_read(&ns16550);
+#ifndef ia64
 		if (x != IGNORE_CODE) {
 			if (x & KEY_RELEASE)
@@ -208,4 +233,13 @@
 				key_pressed(x);
 		}
+#else
+	extern chardev_t kbrd;
+	if(x!=0x0d)
+	{
+	    if(x==0x7f) x='\b';
+	    chardev_push_character(&kbrd,x);
+	}    
+#endif		
+
 	}
 }
Index: kernel/kernel.config
===================================================================
--- kernel/kernel.config	(revision b24786a3475ffcd354ab3fd707a7bb77ce9fa0d7)
+++ kernel/kernel.config	(revision a2a552922110e12b1296ecc23f36d826e7fc4040)
@@ -119,5 +119,5 @@
 
 # Support for SMP
-! [ARCH=ia32|ARCH=amd64|ARCH=ia32xen|ARCH=sparc64] CONFIG_SMP (y/n)
+! [ARCH=ia32|ARCH=amd64|ARCH=ia32xen|ARCH=sparc64|ARCH=ia64] CONFIG_SMP (y/n)
 
 # Improved support for hyperthreading
@@ -140,5 +140,6 @@
 
 # Support for NS16550 serial port
-! [ARCH=sparc64] CONFIG_NS16550 (y/n)
+! [ARCH=sparc64|ARCH=ia64] CONFIG_NS16550 (y/n)
+
 
 # Virtually indexed D-cache support