Index: arch/amd64/src/amd64.c
===================================================================
--- arch/amd64/src/amd64.c	(revision 607c5f9ed835a2f0301c7d609f3e38c0d5e4dc77)
+++ arch/amd64/src/amd64.c	(revision 8418c7d1885256e7d6e4cb637e377cbb2a1be321)
@@ -70,5 +70,4 @@
 	if (config.cpu_active == 1) {
 		bios_init();
-		i8042_init();	/* a20 bit */
 		i8259_init();	/* PIC */
 		i8254_init();	/* hard clock */
@@ -103,5 +102,5 @@
 void arch_post_smp_init(void)
 {
-        trap_virtual_enable_irqs(1<<IRQ_KBD);
+		i8042_init();	/* keyboard controller */
 }