diff options
| -rw-r--r-- | arch/x86/machine/asm.h | 4 | ||||
| -rw-r--r-- | arch/x86/machine/boot.h | 4 | ||||
| -rw-r--r-- | arch/x86/machine/boot_asm.S | 2 | ||||
| -rw-r--r-- | arch/x86/machine/cpu.h | 4 | ||||
| -rw-r--r-- | arch/x86/machine/cpu_asm.S | 2 | ||||
| -rw-r--r-- | arch/x86/machine/multiboot.h | 4 | ||||
| -rw-r--r-- | arch/x86/machine/pmap.h | 4 | ||||
| -rw-r--r-- | arch/x86/x15.lds.S | 2 | ||||
| -rw-r--r-- | lib/macros.h | 10 |
9 files changed, 15 insertions, 21 deletions
diff --git a/arch/x86/machine/asm.h b/arch/x86/machine/asm.h index 07b2d23..c2c4e99 100644 --- a/arch/x86/machine/asm.h +++ b/arch/x86/machine/asm.h @@ -20,7 +20,7 @@ #include <machine/param.h> -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define ASM_ENTRY(x) \ .align TEXT_ALIGN; \ @@ -44,6 +44,6 @@ x ## _end: #define ASM_IRET iret #endif /* __LP64__ */ -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _X86_ASM_H */ diff --git a/arch/x86/machine/boot.h b/arch/x86/machine/boot.h index 749f859..41d3ca4 100644 --- a/arch/x86/machine/boot.h +++ b/arch/x86/machine/boot.h @@ -49,7 +49,7 @@ */ #define BOOT_MP_TRAMPOLINE_ADDR 0x7000 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <machine/multiboot.h> #include <machine/pmap.h> @@ -115,6 +115,6 @@ void boot_main(void); */ void boot_ap(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _X86_BOOT_H */ diff --git a/arch/x86/machine/boot_asm.S b/arch/x86/machine/boot_asm.S index 79c6c31..49074f9 100644 --- a/arch/x86/machine/boot_asm.S +++ b/arch/x86/machine/boot_asm.S @@ -15,8 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define __ASSEMBLY__ - #include <machine/asm.h> #include <machine/cpu.h> #include <machine/boot.h> diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h index d45833f..544703c 100644 --- a/arch/x86/machine/cpu.h +++ b/arch/x86/machine/cpu.h @@ -77,7 +77,7 @@ */ #define CPU_EFER_LME 0x00000100 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <kern/param.h> #include <lib/macros.h> @@ -417,6 +417,6 @@ void cpu_trap_default(void); void cpu_trap_lapic_timer_intr(void); void cpu_trap_lapic_spurious_intr(void); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _X86_CPU_H */ diff --git a/arch/x86/machine/cpu_asm.S b/arch/x86/machine/cpu_asm.S index 9a5f9c9..dfce489 100644 --- a/arch/x86/machine/cpu_asm.S +++ b/arch/x86/machine/cpu_asm.S @@ -15,8 +15,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define __ASSEMBLY__ - #include <machine/asm.h> #include <machine/cpu.h> diff --git a/arch/x86/machine/multiboot.h b/arch/x86/machine/multiboot.h index 1fb018b..7b604a9 100644 --- a/arch/x86/machine/multiboot.h +++ b/arch/x86/machine/multiboot.h @@ -43,7 +43,7 @@ #define MULTIBOOT_LOADER_MODULES 0x08 #define MULTIBOOT_LOADER_MMAP 0x40 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <lib/macros.h> #include <lib/stdint.h> @@ -102,6 +102,6 @@ struct multiboot_info { uint32_t mods_count; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _X86_MULTIBOOT_H */ diff --git a/arch/x86/machine/pmap.h b/arch/x86/machine/pmap.h index b42a0ec..7865f5f 100644 --- a/arch/x86/machine/pmap.h +++ b/arch/x86/machine/pmap.h @@ -98,7 +98,7 @@ #endif /* X86_PAE */ #endif /* __LP64__ */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <kern/types.h> #include <lib/stdint.h> @@ -181,6 +181,6 @@ phys_addr_t pmap_kextract(unsigned long va); */ void pmap_zero_page(phys_addr_t pa); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _X86_PMAP_H */ diff --git a/arch/x86/x15.lds.S b/arch/x86/x15.lds.S index 26fe493..4959c06 100644 --- a/arch/x86/x15.lds.S +++ b/arch/x86/x15.lds.S @@ -8,8 +8,6 @@ OUTPUT_ARCH(i386) ENTRY(_start) -#define __ASSEMBLY__ - #include <machine/boot.h> #include <machine/param.h> diff --git a/lib/macros.h b/lib/macros.h index aec24e1..9983714 100644 --- a/lib/macros.h +++ b/lib/macros.h @@ -21,9 +21,9 @@ #ifndef _LIB_MACROS_H #define _LIB_MACROS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <lib/stddef.h> -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #define MACRO_BEGIN ({ #define MACRO_END }) @@ -31,12 +31,12 @@ #define __QUOTE(x) #x #define QUOTE(x) __QUOTE(x) -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ #define DECL_CONST(x, s) x -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ #define __DECL_CONST(x, s) x##s #define DECL_CONST(x, s) __DECL_CONST(x, s) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #define STRLEN(x) (sizeof(x) - 1) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) |