Index: kernel/generic/include/arch.h
===================================================================
--- kernel/generic/include/arch.h	(revision 28ecadba2f66309e3ea4c819f1e768f64d97b699)
+++ kernel/generic/include/arch.h	(revision 34bd143ee4c95bdedc6565a0e2150902184b4a44)
@@ -76,4 +76,5 @@
 extern void arch_pre_mm_init(void);
 extern void arch_post_mm_init(void);
+extern void arch_post_cpu_init(void);
 extern void arch_pre_smp_init(void);
 extern void arch_post_smp_init(void);
Index: kernel/generic/include/smp/smp.h
===================================================================
--- kernel/generic/include/smp/smp.h	(revision 28ecadba2f66309e3ea4c819f1e768f64d97b699)
+++ kernel/generic/include/smp/smp.h	(revision 34bd143ee4c95bdedc6565a0e2150902184b4a44)
@@ -36,8 +36,13 @@
 #define KERN_SMP_H_
 
+#include <synch/waitq.h>
+
+extern waitq_t ap_completion_wq;
+
 #ifdef CONFIG_SMP
 extern void smp_init(void);
+extern void kmp(void *arg);
 #else
-#define smp_init()	;
+#define smp_init()
 #endif /* CONFIG_SMP */