Index: kernel/arch/arm32/include/arch/context.h
===================================================================
--- kernel/arch/arm32/include/arch/context.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/arm32/include/arch/context.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
@@ -51,7 +51,7 @@
 	} while (0)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/arm32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/frame.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/arm32/include/arch/mm/frame.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
@@ -42,5 +42,5 @@
 #define FRAME_LOWPRIO  0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #define BOOT_PAGE_TABLE_SIZE     0x4000
@@ -81,5 +81,5 @@
 #define physmem_print()
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/arm32/include/arch/mm/page.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/arm32/include/arch/mm/page.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
@@ -48,5 +48,5 @@
 
 #if (defined MACHINE_beagleboardxm) || (defined MACHINE_beaglebone)
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #	define KA2PA(x)	((uintptr_t) (x))
 #	define PA2KA(x)	((uintptr_t) (x))
@@ -56,5 +56,5 @@
 #endif
 #else
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #	define KA2PA(x)	(((uintptr_t) (x)) - 0x80000000)
 #	define PA2KA(x)	(((uintptr_t) (x)) + 0x80000000)
Index: kernel/arch/arm32/include/arch/mm/page_armv4.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/arm32/include/arch/mm/page_armv4.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
@@ -54,5 +54,5 @@
 	1
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 /** Level 0 page table entry. */
@@ -254,5 +254,5 @@
 
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/arm32/include/arch/mm/page_armv6.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ kernel/arch/arm32/include/arch/mm/page_armv6.h	(revision 53ad43cce05b0004bca31a7c5d6822fc33686cf1)
@@ -54,5 +54,5 @@
 	(((pte_t *) (pte))->l1.descriptor_type != PTE_DESCRIPTOR_SMALL_PAGE_NX)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 /** Level 0 page table entry. */
@@ -319,5 +319,5 @@
 extern void page_arch_init(void);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif