Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision 2319df3fb307138936718465566682581aa7fbf3)
+++ kernel/generic/src/main/kinit.c	(revision 6473d41b400a0e37add4151c14a275fde0f6c28b)
@@ -107,4 +107,5 @@
 	if (config.cpu_count > 1) {
 		waitq_initialize(&ap_completion_wq);
+		
 		/*
 		 * Create the kmp thread and wait for its completion.
@@ -124,12 +125,10 @@
 		thread_join(thread);
 		thread_detach(thread);
-	}
-	
-	if (config.cpu_count > 1) {
+		
+		/*
+		 * For each CPU, create its load balancing thread.
+		 */
 		size_t i;
 		
-		/*
-		 * For each CPU, create its load balancing thread.
-		 */
 		for (i = 0; i < config.cpu_count; i++) {
 			thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);