Index: arch/ia32/src/smp/mps.c
===================================================================
--- arch/ia32/src/smp/mps.c	(revision e20de5511199b2d9bad4ba8979f46c50ca063797)
+++ arch/ia32/src/smp/mps.c	(revision 7509ddc323e8b88a1dfd5b12a23bda20b9ea901e)
@@ -80,6 +80,4 @@
 
 waitq_t ap_completion_wq;
-waitq_t kmp_completion_wq;
-
 
 /*
Index: arch/ia32/src/smp/smp.c
===================================================================
--- arch/ia32/src/smp/smp.c	(revision e20de5511199b2d9bad4ba8979f46c50ca063797)
+++ arch/ia32/src/smp/smp.c	(revision 7509ddc323e8b88a1dfd5b12a23bda20b9ea901e)
@@ -85,11 +85,4 @@
 		io_apic = (__u32 *) io_apic_address;
         }
-
-        /* 
-         * Must be initialized outside the kmp thread, since it is waited
-         * on before the kmp thread is created.
-         */
-        waitq_initialize(&kmp_completion_wq);
-
 }
 
@@ -173,10 +166,4 @@
 			printf("INIT IPI for l_apic%d failed\n", ops->cpu_apic_id(i));
 	}
-
-	/*
-	 * Wakeup the kinit thread so that
-	 * system initialization can go on.
-	 */
-	waitq_wakeup(&kmp_completion_wq, WAKEUP_FIRST);
 }