Index: generic/include/smp/ipi.h
===================================================================
--- generic/include/smp/ipi.h	(revision 169c408f8774661800aa0a9685c9914cbb5a974c)
+++ generic/include/smp/ipi.h	(revision e2ec980f093ea2fc11c69070440d9e6f74ebfae4)
@@ -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 169c408f8774661800aa0a9685c9914cbb5a974c)
+++ generic/include/smp/smp.h	(revision e2ec980f093ea2fc11c69070440d9e6f74ebfae4)
@@ -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__ */