Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 42742c5a9c4daa815f9a9127c69040aed0d194e0)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision a212307ca711c2759f33236c7ca554a42a72d9cd)
@@ -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