diff options
| author | Simon Glass <sjg@chromium.org> | 2020-05-10 11:40:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-18 21:19:23 -0400 |
| commit | f09f1ecbe77863ecefe586ccd6000064b49105a3 (patch) | |
| tree | 424300a0c18924e75e0694782fe3e2ba48e884a0 /arch/x86/include | |
| parent | c05ed00afb95fa5237f16962fccf5810437317bf (diff) | |
Use __ASSEMBLY__ as the assembly macros
Some places use __ASSEMBLER__ instead which does not work since the
Makefile does not define it. Fix them.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mtrr.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/sipi.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index 672617256e..212a699c1b 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -57,7 +57,7 @@ #define MTRR_FIX_TYPE(t) ((t << 24) | (t << 16) | (t << 8) | t) -#if !defined(__ASSEMBLER__) +#if !defined(__ASSEMBLY__) /** * Information about the previous MTRR state, set up by mtrr_open() diff --git a/arch/x86/include/asm/sipi.h b/arch/x86/include/asm/sipi.h index 1ab6c2874a..2483422528 100644 --- a/arch/x86/include/asm/sipi.h +++ b/arch/x86/include/asm/sipi.h @@ -10,7 +10,7 @@ #define AP_DEFAULT_BASE 0x30000 #define AP_DEFAULT_SIZE 0x10000 -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ /** * struct sipi_params_16bit - 16-bit SIPI entry-point parameters @@ -81,6 +81,6 @@ void ap_start(void); extern char sipi_params_16bit[]; extern char sipi_params[]; -#endif /* __ASSEMBLER__ */ +#endif /* __ASSEMBLY__ */ #endif |