Index: kernel/arch/sparc64/include/arch/arch.h
===================================================================
--- kernel/arch/sparc64/include/arch/arch.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/arch.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -38,5 +38,5 @@
 #define KERN_sparc64_ARCH_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #include <arch.h>
 #endif
@@ -55,5 +55,5 @@
 #define NWINDOWS  8  /** Number of register window sets. */
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 extern arch_ops_t *sparc64_ops;
@@ -61,5 +61,5 @@
 extern void sparc64_pre_main(bootinfo_t *);
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/boot/boot.h
===================================================================
--- kernel/arch/sparc64/include/arch/boot/boot.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/boot/boot.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -39,5 +39,5 @@
 #define LMA  VMA
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #ifndef __LINKER__
 
Index: kernel/arch/sparc64/include/arch/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/cpu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/cpu.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -52,5 +52,5 @@
 #define IMPL_SPARC64V		0x5
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/register.h>
Index: kernel/arch/sparc64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/frame.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/frame.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -46,5 +46,5 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>
Index: kernel/arch/sparc64/include/arch/mm/page.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/page.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/page.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -54,5 +54,5 @@
 #define MMU_PAGES_PER_PAGE	(1 << (PAGE_WIDTH - MMU_PAGE_WIDTH))
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -73,5 +73,5 @@
 extern void page_arch_init(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4u/frame.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/frame.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/frame.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -54,5 +54,5 @@
 #define FRAME_LOWPRIO  0
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <typedefs.h>
Index: kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -87,5 +87,5 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/asm.h>
@@ -116,5 +116,5 @@
 #endif /* US */
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -92,5 +92,5 @@
 #define TLB_TAG_ACCESS_VPN_SHIFT	13
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/tte.h>
@@ -687,5 +687,5 @@
 extern void describe_dmmu_fault(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -56,5 +56,5 @@
 #define TSB_TAG_TARGET_CONTEXT_SHIFT	48
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/tte.h>
@@ -171,5 +171,5 @@
 extern void dtsb_pte_copy(struct pte *t, size_t index, bool ro);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tte.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tte.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -47,5 +47,5 @@
 #define TTE_SIZE_SHIFT	61
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -97,5 +97,5 @@
 typedef union tte_data tte_data_t;
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4v/page.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/page.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/page.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -46,5 +46,5 @@
 #define MMU_PAGES_PER_PAGE	(1 << (PAGE_WIDTH - MMU_PAGE_WIDTH))
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -65,5 +65,5 @@
 extern void page_arch_init(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -40,5 +40,5 @@
 #define MMU_FSA_SIZE		128
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/mm/tte.h>
@@ -149,5 +149,5 @@
 extern void describe_dmmu_fault(void);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tsb.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -49,5 +49,5 @@
 #define TSB_FRAMES			SIZE2FRAMES(TSB_SIZE)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdbool.h>
@@ -76,5 +76,5 @@
 extern void dtsb_pte_copy(struct pte *t, bool ro);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tte.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tte.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -48,5 +48,5 @@
 #define MMU_FLAG_DTLB	1	/**< operation applies to DTLB */
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -76,5 +76,5 @@
 #define VA_TAG_PAGE_SHIFT	22
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/sun4u/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -52,5 +52,5 @@
 #define IMPL_SPARC64V  0x5
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/register.h>
Index: kernel/arch/sparc64/include/arch/sun4v/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/cpu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/sun4v/cpu.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -42,5 +42,5 @@
 #define MAX_CORE_STRANDS  8
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <atomic.h>
Index: kernel/arch/sparc64/include/arch/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -117,5 +117,5 @@
 
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
Index: kernel/arch/sparc64/include/arch/trap/exception.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/exception.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/exception.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -65,5 +65,5 @@
 #define TT_STQF_MEM_ADDRESS_NOT_ALIGNED		0x39
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -91,5 +91,5 @@
 extern void STQF_mem_address_not_aligned(unsigned int, istate_t *);
 
-#endif /* !__ASM__ */
+#endif /* !__ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/trap/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/interrupt.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/interrupt.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -63,5 +63,5 @@
 #define IGN_SHIFT	6
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/interrupt.h>
@@ -69,5 +69,5 @@
 extern void interrupt(unsigned int n, istate_t *istate);
 
-#endif /* !def __ASM__ */
+#endif /* !def __ASSEMBLER__ */
 
 
Index: kernel/arch/sparc64/include/arch/trap/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/regwin.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/regwin.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -78,5 +78,5 @@
 #define UWB_ALIGNMENT	1024
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /*
@@ -202,5 +202,5 @@
 	retry
 .endm
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #if defined(SUN4U)
Index: kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/mmu.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -55,5 +55,5 @@
 #define FAST_MMU_HANDLER_SIZE			128
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 .macro FAST_INSTRUCTION_ACCESS_MMU_MISS_HANDLER
@@ -166,5 +166,5 @@
 .endm
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/sun4u/regwin.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -33,5 +33,5 @@
 #define KERN_sparc64_sun4u_REGWIN_H_
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /*
Index: kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/interrupt.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -38,5 +38,5 @@
 #define KERN_sparc64_TRAP_SUN4V_INTERRUPT_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <arch/istate_struct.h>
Index: kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -61,5 +61,5 @@
 #define FAST_MMU_HANDLER_SIZE			128
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /* MMU fault status area data fault offset */
@@ -181,5 +181,5 @@
 	PREEMPTIBLE_HANDLER exc_dispatch
 .endm
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif
Index: kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/sun4v/regwin.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -34,5 +34,5 @@
 #define KERN_sparc64_sun4v_REGWIN_H_
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 
 /*
Index: kernel/arch/sparc64/include/arch/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/trap_table.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ kernel/arch/sparc64/include/arch/trap/trap_table.h	(revision f3d47c976431122cd3b0844f80937c7fdb899b40)
@@ -43,5 +43,5 @@
 #define TRAP_TABLE_SIZE		(TRAP_TABLE_ENTRY_COUNT * TRAP_TABLE_ENTRY_SIZE)
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 
 #include <stdint.h>
@@ -56,7 +56,7 @@
 extern trap_table_entry_t trap_table_save[TRAP_TABLE_ENTRY_COUNT];
 
-#endif /* !__ASM__ */
+#endif /* !__ASSEMBLER__ */
 
-#ifdef __ASM__
+#ifdef __ASSEMBLER__
 .macro SAVE_GLOBALS
 	mov %g1, %l1
@@ -85,5 +85,5 @@
 .endm
 
-#endif /* __ASM__ */
+#endif /* __ASSEMBLER__ */
 
 #endif