Index: generic/include/cpu.h
===================================================================
--- generic/include/cpu.h	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
+++ generic/include/cpu.h	(revision 36a140b0bcc2aad4559358d768021df63fd67aa9)
@@ -53,8 +53,8 @@
 	link_t timeout_active_head;
 
-	#ifdef __SMP__
+	#ifdef CONFIG_SMP
 	int kcpulbstarted;
 	waitq_t kcpulb_wq;
-	#endif /* __SMP__ */
+	#endif /* CONFIG_SMP */
 
 	int id;
Index: generic/include/mm/tlb.h
===================================================================
--- generic/include/mm/tlb.h	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
+++ generic/include/mm/tlb.h	(revision 36a140b0bcc2aad4559358d768021df63fd67aa9)
@@ -34,5 +34,5 @@
 extern void tlb_init(void);
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 extern void tlb_shootdown_start(void);
 extern void tlb_shootdown_finalize(void);
@@ -42,5 +42,5 @@
 #  define tlb_shootdown_finalize()	;
 #  define tlb_shootdown_ipi_recv() ;
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 /* Export TLB interface that each architecture must implement. */
Index: generic/include/smp/ipi.h
===================================================================
--- generic/include/smp/ipi.h	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
+++ generic/include/smp/ipi.h	(revision 36a140b0bcc2aad4559358d768021df63fd67aa9)
@@ -30,10 +30,10 @@
 #define __IPI_H__
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 extern void ipi_broadcast(int ipi);
 extern void ipi_broadcast_arch(int ipi);
 #else
 #define ipi_broadcast(x)	;
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 #endif
Index: generic/include/smp/smp.h
===================================================================
--- generic/include/smp/smp.h	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
+++ generic/include/smp/smp.h	(revision 36a140b0bcc2aad4559358d768021df63fd67aa9)
@@ -30,9 +30,9 @@
 #define __SMP_H__
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 extern void smp_init(void);
 #else
 #define smp_init()	;
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 #endif /* __SMP_H__ */
Index: generic/include/synch/spinlock.h
===================================================================
--- generic/include/synch/spinlock.h	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
+++ generic/include/synch/spinlock.h	(revision 36a140b0bcc2aad4559358d768021df63fd67aa9)
@@ -34,5 +34,5 @@
 #include <preemption.h>
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 struct spinlock {
 	int val;