Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision a188131444517e83d92103dac71acb5f03aae769)
+++ kernel/generic/src/main/kinit.c	(revision a78b0a0431e252aaadea9fc13ea3c15a62663075)
@@ -108,6 +108,4 @@
 #ifdef CONFIG_SMP
 	if (config.cpu_count > 1) {
-		semaphore_initialize(&ap_completion_semaphore, 0);
-
 		/*
 		 * Create the kmp thread and wait for its completion.
Index: kernel/generic/src/smp/smp.c
===================================================================
--- kernel/generic/src/smp/smp.c	(revision a188131444517e83d92103dac71acb5f03aae769)
+++ kernel/generic/src/smp/smp.c	(revision a78b0a0431e252aaadea9fc13ea3c15a62663075)
@@ -39,5 +39,5 @@
 #ifdef CONFIG_SMP
 
-semaphore_t ap_completion_semaphore;
+SEMAPHORE_INITIALIZE(ap_completion_semaphore, 0);
 
 #endif /* CONFIG_SMP */