Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/arch/amd64/src/amd64.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -64,4 +64,5 @@
 #include <ddi/irq.h>
 #include <ddi/device.h>
+#include <sysinfo/sysinfo.h>
 
 
@@ -174,7 +175,15 @@
 void arch_post_smp_init(void)
 {
+	devno_t devno = device_assign_devno();
 	/* keyboard controller */
-	(void) i8042_init((i8042_t *) I8042_BASE, device_assign_devno(),
-	    IRQ_KBD);
+	(void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+
+	/*
+	 * This is the necessary evil until the userspace driver is entirely
+	 * self-sufficient.
+	 */
+	sysinfo_set_item_val("kbd", NULL, true);
+	sysinfo_set_item_val("kbd.devno", NULL, devno);
+	sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
 }
 
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/arch/ia32/src/ia32.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -63,4 +63,5 @@
 #include <console/console.h>
 #include <ddi/device.h>
+#include <sysinfo/sysinfo.h>
 
 #ifdef CONFIG_SMP
@@ -125,7 +126,15 @@
 void arch_post_smp_init(void)
 {
-	devno_t kbd = device_assign_devno();
+	devno_t devno = device_assign_devno();
 	/* keyboard controller */
-	(void) i8042_init((i8042_t *) I8042_BASE, kbd, IRQ_KBD);
+	(void) i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+
+	/*
+	 * This is the necessary evil until the userspace driver is entirely
+	 * self-sufficient.
+	 */
+	sysinfo_set_item_val("kbd", NULL, true);
+	sysinfo_set_item_val("kbd.devno", NULL, devno);
+	sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
 }
 
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/arch/ia64/src/ia64.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -161,12 +161,20 @@
 
 #ifdef I460GX
-	devno_t kbd = device_assign_devno();
+	devno_t devno = device_assign_devno();
+	inr_t inr;
 
 #ifdef CONFIG_NS16550
-	(void) ns16550_init((ns16550_t *)NS16550_BASE, kbd, NS16550_IRQ, NULL,
-	     NULL);
+	inr = NS16550_IRQ;
+	(void) ns16550_init((ns16550_t *)NS16550_BASE, devno, inr, NULL, NULL);
+	sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
+	sysinfo_set_item_val("kbd.port", NULL, (uintptr_t)NS16550_BASE);
 #else
-	(void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
-#endif
+	inr = IRQ_KBD;
+	(void) i8042_init((i8042_t *)I8042_BASE, devno, inr);
+	sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
+#endif
+	sysinfo_set_item_val("kbd", NULL, true);
+	sysinfo_set_item_val("kbd.devno", NULL, devno);
+	sysinfo_set_item_val("kbd.inr", NULL, inr);
 #endif
 
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -67,4 +67,11 @@
 	cir_t cir;
 	void *cir_arg;
+
+#ifdef CONFIG_NS16550
+	ns16550_t *ns16550;
+#endif
+#ifdef CONFIG_Z8530
+	z8530_t *z8530;
+#endif
 	
 	name = ofw_tree_node_name(node);
@@ -101,4 +108,5 @@
 	uintptr_t pa;
 	size_t size;
+	devno_t devno;
 	inr_t inr;
 	
@@ -149,14 +157,40 @@
 #ifdef CONFIG_Z8530
 	case KBD_Z8530:
-		(void) z8530_init((z8530_t *) hw_map(aligned_addr,
-		    offset + size) + offset, device_assign_devno(), inr, cir,
-		    cir_arg);
+		devno = device_assign_devno();
+		z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
+		    offset;
+		(void) z8530_init(z8530, devno, inr, cir, cir_arg);
+		
+		/*
+		 * This is the necessary evil until the userspace drivers are
+		 * entirely self-sufficient.
+		 */
+		sysinfo_set_item_val("kbd", NULL, true);
+		sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530);
+		sysinfo_set_item_val("kbd.devno", NULL, devno);
+		sysinfo_set_item_val("kbd.inr", NULL, inr);
+		sysinfo_set_item_val("kbd.address.virtual", NULL,
+		    (uintptr_t) z8530);
+		sysinfo_set_item_val("kbd.address.physical", NULL, pa);
 		break;
 #endif
 #ifdef CONFIG_NS16550
 	case KBD_NS16550:
-		(void) ns16550_init((ns16550_t *) (hw_map(aligned_addr,
-		    offset + size) + offset), device_assign_devno(), inr, cir,
-		    cir_arg);
+		devno = device_assign_devno();
+		ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
+		    offset;
+		(void) ns16550_init(ns16550, devno, inr, cir, cir_arg);
+		
+		/*
+		 * This is the necessary evil until the userspace driver is
+		 * entirely self-sufficient.
+		 */
+		sysinfo_set_item_val("kbd", NULL, true);
+		sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
+		sysinfo_set_item_val("kbd.devno", NULL, devno);
+		sysinfo_set_item_val("kbd.inr", NULL, inr);
+		sysinfo_set_item_val("kbd.address.virtual", NULL,
+		    (uintptr_t) ns16550);
+		sysinfo_set_item_val("kbd.address.physical", NULL, pa);
 		break;
 #endif
Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/genarch/src/kbd/i8042.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -49,5 +49,4 @@
 #include <console/console.h>
 #include <interrupt.h>
-#include <sysinfo/sysinfo.h>
 
 /* Keyboard commands. */
@@ -149,15 +148,4 @@
 		(void) pio_read_8(&dev->data);
 	
-	/*
-	 * This is the necessary evil until the userspace driver is entirely
-	 * self-sufficient.
-	 */
-	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, inr);
-#ifdef KBD_LEGACY
-	sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
-#endif
-
 	return true;
 }
Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/genarch/src/kbd/ns16550.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2001-2006 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -48,5 +48,4 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <sysinfo/sysinfo.h>
 #include <synch/spinlock.h>
 #include <mm/slab.h>
@@ -105,15 +104,4 @@
 		(void) pio_read_8(&dev->rbr);
 	
-	/*
-	 * This is the necessary evil until the userspace driver is entirely
-	 * self-sufficient.
-	 */
-	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, inr);
-	sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
-	sysinfo_set_item_val("kbd.port", NULL, (uintptr_t) dev);
-	
 	/* Enable interrupts */
 	pio_write_8(&dev->ier, IER_ERBFI);
Index: kernel/genarch/src/kbd/z8530.c
===================================================================
--- kernel/genarch/src/kbd/z8530.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/genarch/src/kbd/z8530.c	(revision 4c7257ba8f4ef0df71aab7099fb893bdddff511d)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -42,5 +42,4 @@
 #include <console/console.h>
 #include <console/chardev.h>
-#include <sysinfo/sysinfo.h>
 #include <ddi/irq.h>
 #include <arch/asm.h>
@@ -123,14 +122,4 @@
 	z8530_write(&dev->ctl_a, WR9, WR9_MIE);
 
-	/*
-	 * This is the necessary evil until the userspace drivers are entirely
-	 * self-sufficient.
-	 */
-	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, inr);
-	sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
-
 	return true;
 }