Index: generic/src/cpu/cpu.c
===================================================================
--- generic/src/cpu/cpu.c	(revision 169c408f8774661800aa0a9685c9914cbb5a974c)
+++ generic/src/cpu/cpu.c	(revision 2ccd27513379512abd7c8b126c84a0323a3cb5b6)
@@ -50,7 +50,7 @@
 	int i, j;
 	
-	#ifdef __SMP__
+	#ifdef CONFIG_SMP
 	if (config.cpu_active == 1) {
-	#endif /* __SMP__ */
+	#endif /* CONFIG_SMP */
 		cpus = (cpu_t *) malloc(sizeof(cpu_t) * config.cpu_count);
 		if (!cpus)
@@ -67,5 +67,5 @@
 			cpus[i].id = i;
 			
-			#ifdef __SMP__
+			#ifdef CONFIG_SMP
 			waitq_initialize(&cpus[i].kcpulb_wq);
 			#endif /* __SMP */
@@ -76,7 +76,7 @@
 		}
 		
-	#ifdef __SMP__
+	#ifdef CONFIG_SMP
 	}
-	#endif /* __SMP__ */
+	#endif /* CONFIG_SMP */
 
 	CPU = &cpus[config.cpu_active-1];