tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers

While the GCC and Clang compilers already define __ASSEMBLER__
automatically when compiling assembly code, __ASSEMBLY__ is a
macro that only gets defined by the Makefiles in the kernel.

This can be very confusing when switching between userspace
and kernelspace coding, or when dealing with UAPI headers that
rather should use __ASSEMBLER__ instead. So let's standardize on
the __ASSEMBLER__ macro that is provided by the compilers now.

This is mostly a mechanical patch (done with a simple "sed -i"
statement), with some manual tweaks in <asm/frame.h>, <asm/hw_irq.h>
and <asm/setup.h> that mentioned this macro in comments with some
missing underscores.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250314071013.1575167-38-thuth@redhat.com

authored by

Thomas Huth and committed by
Ingo Molnar 24a295e4 8a141be3

+201 -201
+2 -2
arch/x86/boot/boot.h
··· 16 16 17 17 #define STACK_SIZE 1024 /* Minimum number of bytes for stack */ 18 18 19 - #ifndef __ASSEMBLY__ 19 + #ifndef __ASSEMBLER__ 20 20 21 21 #include <linux/stdarg.h> 22 22 #include <linux/types.h> ··· 327 327 /* video-vesa.c */ 328 328 void vesa_store_edid(void); 329 329 330 - #endif /* __ASSEMBLY__ */ 330 + #endif /* __ASSEMBLER__ */ 331 331 332 332 #endif /* BOOT_BOOT_H */
+1 -1
arch/x86/entry/vdso/extable.h
··· 7 7 * vDSO uses a dedicated handler the addresses are relative to the overall 8 8 * exception table, not each individual entry. 9 9 */ 10 - #ifdef __ASSEMBLY__ 10 + #ifdef __ASSEMBLER__ 11 11 #define _ASM_VDSO_EXTABLE_HANDLE(from, to) \ 12 12 ASM_VDSO_EXTABLE_HANDLE from to 13 13
+3 -3
arch/x86/include/asm/alternative.h
··· 15 15 #define ALT_DIRECT_CALL(feature) ((ALT_FLAG_DIRECT_CALL << ALT_FLAGS_SHIFT) | (feature)) 16 16 #define ALT_CALL_ALWAYS ALT_DIRECT_CALL(X86_FEATURE_ALWAYS) 17 17 18 - #ifndef __ASSEMBLY__ 18 + #ifndef __ASSEMBLER__ 19 19 20 20 #include <linux/stddef.h> 21 21 ··· 277 277 void BUG_func(void); 278 278 void nop_func(void); 279 279 280 - #else /* __ASSEMBLY__ */ 280 + #else /* __ASSEMBLER__ */ 281 281 282 282 #ifdef CONFIG_SMP 283 283 .macro LOCK_PREFIX ··· 360 360 ALTERNATIVE_2 oldinstr, newinstr_no, X86_FEATURE_ALWAYS, \ 361 361 newinstr_yes, ft_flags 362 362 363 - #endif /* __ASSEMBLY__ */ 363 + #endif /* __ASSEMBLER__ */ 364 364 365 365 #endif /* _ASM_X86_ALTERNATIVE_H */
+5 -5
arch/x86/include/asm/asm.h
··· 2 2 #ifndef _ASM_X86_ASM_H 3 3 #define _ASM_X86_ASM_H 4 4 5 - #ifdef __ASSEMBLY__ 5 + #ifdef __ASSEMBLER__ 6 6 # define __ASM_FORM(x, ...) x,## __VA_ARGS__ 7 7 # define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__ 8 8 # define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__, ··· 113 113 114 114 #endif 115 115 116 - #ifndef __ASSEMBLY__ 116 + #ifndef __ASSEMBLER__ 117 117 #ifndef __pic__ 118 118 static __always_inline __pure void *rip_rel_ptr(void *p) 119 119 { ··· 144 144 # include <asm/extable_fixup_types.h> 145 145 146 146 /* Exception table entry */ 147 - #ifdef __ASSEMBLY__ 147 + #ifdef __ASSEMBLER__ 148 148 149 149 # define _ASM_EXTABLE_TYPE(from, to, type) \ 150 150 .pushsection "__ex_table","a" ; \ ··· 164 164 # define _ASM_NOKPROBE(entry) 165 165 # endif 166 166 167 - #else /* ! __ASSEMBLY__ */ 167 + #else /* ! __ASSEMBLER__ */ 168 168 169 169 # define DEFINE_EXTABLE_TYPE_REG \ 170 170 ".macro extable_type_reg type:req reg:req\n" \ ··· 232 232 */ 233 233 register unsigned long current_stack_pointer asm(_ASM_SP); 234 234 #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) 235 - #endif /* __ASSEMBLY__ */ 235 + #endif /* __ASSEMBLER__ */ 236 236 237 237 #define _ASM_EXTABLE(from, to) \ 238 238 _ASM_EXTABLE_TYPE(from, to, EX_TYPE_DEFAULT)
+1 -1
arch/x86/include/asm/boot.h
··· 74 74 # define BOOT_STACK_SIZE 0x1000 75 75 #endif 76 76 77 - #ifndef __ASSEMBLY__ 77 + #ifndef __ASSEMBLER__ 78 78 extern unsigned int output_len; 79 79 extern const unsigned long kernel_text_size; 80 80 extern const unsigned long kernel_total_size;
+2 -2
arch/x86/include/asm/cpufeature.h
··· 4 4 5 5 #include <asm/processor.h> 6 6 7 - #if defined(__KERNEL__) && !defined(__ASSEMBLY__) 7 + #if defined(__KERNEL__) && !defined(__ASSEMBLER__) 8 8 9 9 #include <asm/asm.h> 10 10 #include <linux/bitops.h> ··· 137 137 #define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \ 138 138 boot_cpu_data.x86_model 139 139 140 - #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ 140 + #endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */ 141 141 #endif /* _ASM_X86_CPUFEATURE_H */
+2 -2
arch/x86/include/asm/cpumask.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _ASM_X86_CPUMASK_H 3 3 #define _ASM_X86_CPUMASK_H 4 - #ifndef __ASSEMBLY__ 4 + #ifndef __ASSEMBLER__ 5 5 #include <linux/cpumask.h> 6 6 7 7 extern void setup_cpu_local_masks(void); ··· 34 34 35 35 #define arch_cpu_is_offline(cpu) unlikely(!arch_cpu_online(cpu)) 36 36 37 - #endif /* __ASSEMBLY__ */ 37 + #endif /* __ASSEMBLER__ */ 38 38 #endif /* _ASM_X86_CPUMASK_H */
+2 -2
arch/x86/include/asm/current.h
··· 5 5 #include <linux/build_bug.h> 6 6 #include <linux/compiler.h> 7 7 8 - #ifndef __ASSEMBLY__ 8 + #ifndef __ASSEMBLER__ 9 9 10 10 #include <linux/cache.h> 11 11 #include <asm/percpu.h> ··· 27 27 28 28 #define current get_current() 29 29 30 - #endif /* __ASSEMBLY__ */ 30 + #endif /* __ASSEMBLER__ */ 31 31 32 32 #endif /* _ASM_X86_CURRENT_H */
+2 -2
arch/x86/include/asm/desc_defs.h
··· 58 58 59 59 #define DESC_USER (_DESC_DPL(3)) 60 60 61 - #ifndef __ASSEMBLY__ 61 + #ifndef __ASSEMBLER__ 62 62 63 63 #include <linux/types.h> 64 64 ··· 166 166 unsigned long address; 167 167 } __attribute__((packed)) ; 168 168 169 - #endif /* !__ASSEMBLY__ */ 169 + #endif /* !__ASSEMBLER__ */ 170 170 171 171 /* Boot IDT definitions */ 172 172 #define BOOT_IDT_ENTRIES 32
+1 -1
arch/x86/include/asm/dwarf2.h
··· 2 2 #ifndef _ASM_X86_DWARF2_H 3 3 #define _ASM_X86_DWARF2_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #warning "asm/dwarf2.h should be only included in pure assembly files" 7 7 #endif 8 8
+2 -2
arch/x86/include/asm/fixmap.h
··· 31 31 /* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */ 32 32 #define FIXMAP_PMD_TOP 507 33 33 34 - #ifndef __ASSEMBLY__ 34 + #ifndef __ASSEMBLER__ 35 35 #include <linux/kernel.h> 36 36 #include <asm/apicdef.h> 37 37 #include <asm/page.h> ··· 196 196 void __early_set_fixmap(enum fixed_addresses idx, 197 197 phys_addr_t phys, pgprot_t flags); 198 198 199 - #endif /* !__ASSEMBLY__ */ 199 + #endif /* !__ASSEMBLER__ */ 200 200 #endif /* _ASM_X86_FIXMAP_H */
+5 -5
arch/x86/include/asm/frame.h
··· 11 11 12 12 #ifdef CONFIG_FRAME_POINTER 13 13 14 - #ifdef __ASSEMBLY__ 14 + #ifdef __ASSEMBLER__ 15 15 16 16 .macro FRAME_BEGIN 17 17 push %_ASM_BP ··· 51 51 .endm 52 52 #endif /* CONFIG_X86_64 */ 53 53 54 - #else /* !__ASSEMBLY__ */ 54 + #else /* !__ASSEMBLER__ */ 55 55 56 56 #define FRAME_BEGIN \ 57 57 "push %" _ASM_BP "\n" \ ··· 82 82 83 83 #endif /* CONFIG_X86_64 */ 84 84 85 - #endif /* __ASSEMBLY__ */ 85 + #endif /* __ASSEMBLER__ */ 86 86 87 87 #define FRAME_OFFSET __ASM_SEL(4, 8) 88 88 89 89 #else /* !CONFIG_FRAME_POINTER */ 90 90 91 - #ifdef __ASSEMBLY__ 91 + #ifdef __ASSEMBLER__ 92 92 93 93 .macro ENCODE_FRAME_POINTER ptregs_offset=0 94 94 .endm 95 95 96 - #else /* !__ASSEMBLY */ 96 + #else /* !__ASSEMBLER__ */ 97 97 98 98 #define ENCODE_FRAME_POINTER 99 99
+2 -2
arch/x86/include/asm/fred.h
··· 32 32 #define FRED_CONFIG_INT_STKLVL(l) (_AT(unsigned long, l) << 9) 33 33 #define FRED_CONFIG_ENTRYPOINT(p) _AT(unsigned long, (p)) 34 34 35 - #ifndef __ASSEMBLY__ 35 + #ifndef __ASSEMBLER__ 36 36 37 37 #ifdef CONFIG_X86_FRED 38 38 #include <linux/kernel.h> ··· 113 113 static inline void fred_sync_rsp0(unsigned long rsp0) { } 114 114 static inline void fred_update_rsp0(void) { } 115 115 #endif /* CONFIG_X86_FRED */ 116 - #endif /* !__ASSEMBLY__ */ 116 + #endif /* !__ASSEMBLER__ */ 117 117 118 118 #endif /* ASM_X86_FRED_H */
+2 -2
arch/x86/include/asm/fsgsbase.h
··· 2 2 #ifndef _ASM_FSGSBASE_H 3 3 #define _ASM_FSGSBASE_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 #ifdef CONFIG_X86_64 8 8 ··· 80 80 81 81 #endif /* CONFIG_X86_64 */ 82 82 83 - #endif /* __ASSEMBLY__ */ 83 + #endif /* __ASSEMBLER__ */ 84 84 85 85 #endif /* _ASM_FSGSBASE_H */
+4 -4
arch/x86/include/asm/ftrace.h
··· 22 22 #define ARCH_SUPPORTS_FTRACE_OPS 1 23 23 #endif 24 24 25 - #ifndef __ASSEMBLY__ 25 + #ifndef __ASSEMBLER__ 26 26 extern void __fentry__(void); 27 27 28 28 static inline unsigned long ftrace_call_adjust(unsigned long addr) ··· 106 106 }; 107 107 108 108 #endif /* CONFIG_DYNAMIC_FTRACE */ 109 - #endif /* __ASSEMBLY__ */ 109 + #endif /* __ASSEMBLER__ */ 110 110 #endif /* CONFIG_FUNCTION_TRACER */ 111 111 112 112 113 - #ifndef __ASSEMBLY__ 113 + #ifndef __ASSEMBLER__ 114 114 115 115 void prepare_ftrace_return(unsigned long ip, unsigned long *parent, 116 116 unsigned long frame_pointer); ··· 154 154 } 155 155 #endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_IA32_EMULATION */ 156 156 #endif /* !COMPILE_OFFSETS */ 157 - #endif /* !__ASSEMBLY__ */ 157 + #endif /* !__ASSEMBLER__ */ 158 158 159 159 #endif /* _ASM_X86_FTRACE_H */
+2 -2
arch/x86/include/asm/hw_irq.h
··· 16 16 17 17 #include <asm/irq_vectors.h> 18 18 19 - #ifndef __ASSEMBLY__ 19 + #ifndef __ASSEMBLER__ 20 20 21 21 #include <linux/percpu.h> 22 22 #include <linux/profile.h> ··· 128 128 typedef struct irq_desc* vector_irq_t[NR_VECTORS]; 129 129 DECLARE_PER_CPU(vector_irq_t, vector_irq); 130 130 131 - #endif /* !ASSEMBLY_ */ 131 + #endif /* !__ASSEMBLER__ */ 132 132 133 133 #endif /* _ASM_X86_HW_IRQ_H */
+6 -6
arch/x86/include/asm/ibt.h
··· 21 21 22 22 #define HAS_KERNEL_IBT 1 23 23 24 - #ifndef __ASSEMBLY__ 24 + #ifndef __ASSEMBLER__ 25 25 26 26 #ifdef CONFIG_X86_64 27 27 #define ASM_ENDBR "endbr64\n\t" ··· 82 82 extern __noendbr u64 ibt_save(bool disable); 83 83 extern __noendbr void ibt_restore(u64 save); 84 84 85 - #else /* __ASSEMBLY__ */ 85 + #else /* __ASSEMBLER__ */ 86 86 87 87 #ifdef CONFIG_X86_64 88 88 #define ENDBR endbr64 ··· 90 90 #define ENDBR endbr32 91 91 #endif 92 92 93 - #endif /* __ASSEMBLY__ */ 93 + #endif /* __ASSEMBLER__ */ 94 94 95 95 #else /* !IBT */ 96 96 97 97 #define HAS_KERNEL_IBT 0 98 98 99 - #ifndef __ASSEMBLY__ 99 + #ifndef __ASSEMBLER__ 100 100 101 101 #define ASM_ENDBR 102 102 #define IBT_NOSEAL(name) ··· 108 108 static inline u64 ibt_save(bool disable) { return 0; } 109 109 static inline void ibt_restore(u64 save) { } 110 110 111 - #else /* __ASSEMBLY__ */ 111 + #else /* __ASSEMBLER__ */ 112 112 113 113 #define ENDBR 114 114 115 - #endif /* __ASSEMBLY__ */ 115 + #endif /* __ASSEMBLER__ */ 116 116 117 117 #endif /* CONFIG_X86_KERNEL_IBT */ 118 118
+3 -3
arch/x86/include/asm/idtentry.h
··· 7 7 8 8 #define IDT_ALIGN (8 * (1 + HAS_KERNEL_IBT)) 9 9 10 - #ifndef __ASSEMBLY__ 10 + #ifndef __ASSEMBLER__ 11 11 #include <linux/entry-common.h> 12 12 #include <linux/hardirq.h> 13 13 ··· 474 474 idt_install_sysvec(vector, asm_##function); \ 475 475 } 476 476 477 - #else /* !__ASSEMBLY__ */ 477 + #else /* !__ASSEMBLER__ */ 478 478 479 479 /* 480 480 * The ASM variants for DECLARE_IDTENTRY*() which emit the ASM entry stubs. ··· 579 579 SYM_CODE_END(spurious_entries_start) 580 580 #endif 581 581 582 - #endif /* __ASSEMBLY__ */ 582 + #endif /* __ASSEMBLER__ */ 583 583 584 584 /* 585 585 * The actual entry points. Note that DECLARE_IDTENTRY*() serves two
+1 -1
arch/x86/include/asm/inst.h
··· 6 6 #ifndef X86_ASM_INST_H 7 7 #define X86_ASM_INST_H 8 8 9 - #ifdef __ASSEMBLY__ 9 + #ifdef __ASSEMBLER__ 10 10 11 11 #define REG_NUM_INVALID 100 12 12
+5 -5
arch/x86/include/asm/irqflags.h
··· 4 4 5 5 #include <asm/processor-flags.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 #include <asm/nospec-branch.h> 10 10 ··· 79 79 #ifdef CONFIG_PARAVIRT_XXL 80 80 #include <asm/paravirt.h> 81 81 #else 82 - #ifndef __ASSEMBLY__ 82 + #ifndef __ASSEMBLER__ 83 83 #include <linux/types.h> 84 84 85 85 static __always_inline unsigned long arch_local_save_flags(void) ··· 133 133 134 134 #endif 135 135 136 - #endif /* __ASSEMBLY__ */ 136 + #endif /* __ASSEMBLER__ */ 137 137 #endif /* CONFIG_PARAVIRT_XXL */ 138 138 139 - #ifndef __ASSEMBLY__ 139 + #ifndef __ASSEMBLER__ 140 140 static __always_inline int arch_irqs_disabled_flags(unsigned long flags) 141 141 { 142 142 return !(flags & X86_EFLAGS_IF); ··· 154 154 if (!arch_irqs_disabled_flags(flags)) 155 155 arch_local_irq_enable(); 156 156 } 157 - #endif /* !__ASSEMBLY__ */ 157 + #endif /* !__ASSEMBLER__ */ 158 158 159 159 #endif
+2 -2
arch/x86/include/asm/jump_label.h
··· 7 7 #include <asm/asm.h> 8 8 #include <asm/nops.h> 9 9 10 - #ifndef __ASSEMBLY__ 10 + #ifndef __ASSEMBLER__ 11 11 12 12 #include <linux/stringify.h> 13 13 #include <linux/types.h> ··· 55 55 56 56 extern int arch_jump_entry_size(struct jump_entry *entry); 57 57 58 - #endif /* __ASSEMBLY__ */ 58 + #endif /* __ASSEMBLER__ */ 59 59 60 60 #endif
+1 -1
arch/x86/include/asm/kasan.h
··· 23 23 (1ULL << (__VIRTUAL_MASK_SHIFT - \ 24 24 KASAN_SHADOW_SCALE_SHIFT))) 25 25 26 - #ifndef __ASSEMBLY__ 26 + #ifndef __ASSEMBLER__ 27 27 28 28 #ifdef CONFIG_KASAN 29 29 void __init kasan_early_init(void);
+2 -2
arch/x86/include/asm/kexec.h
··· 13 13 # define KEXEC_CONTROL_PAGE_SIZE 4096 14 14 # define KEXEC_CONTROL_CODE_MAX_SIZE 2048 15 15 16 - #ifndef __ASSEMBLY__ 16 + #ifndef __ASSEMBLER__ 17 17 18 18 #include <linux/string.h> 19 19 #include <linux/kernel.h> ··· 217 217 #define crash_get_elfcorehdr_size arch_crash_get_elfcorehdr_size 218 218 #endif 219 219 220 - #endif /* __ASSEMBLY__ */ 220 + #endif /* __ASSEMBLER__ */ 221 221 222 222 #endif /* _ASM_X86_KEXEC_H */
+3 -3
arch/x86/include/asm/linkage.h
··· 38 38 #define ASM_FUNC_ALIGN __stringify(__FUNC_ALIGN) 39 39 #define SYM_F_ALIGN __FUNC_ALIGN 40 40 41 - #ifdef __ASSEMBLY__ 41 + #ifdef __ASSEMBLER__ 42 42 43 43 #if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) 44 44 #define RET jmp __x86_return_thunk ··· 50 50 #endif 51 51 #endif /* CONFIG_MITIGATION_RETPOLINE */ 52 52 53 - #else /* __ASSEMBLY__ */ 53 + #else /* __ASSEMBLER__ */ 54 54 55 55 #if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) 56 56 #define ASM_RET "jmp __x86_return_thunk\n\t" ··· 62 62 #endif 63 63 #endif /* CONFIG_MITIGATION_RETPOLINE */ 64 64 65 - #endif /* __ASSEMBLY__ */ 65 + #endif /* __ASSEMBLER__ */ 66 66 67 67 /* 68 68 * Depending on -fpatchable-function-entry=N,N usage (CONFIG_CALL_PADDING) the
+2 -2
arch/x86/include/asm/mem_encrypt.h
··· 10 10 #ifndef __X86_MEM_ENCRYPT_H__ 11 11 #define __X86_MEM_ENCRYPT_H__ 12 12 13 - #ifndef __ASSEMBLY__ 13 + #ifndef __ASSEMBLER__ 14 14 15 15 #include <linux/init.h> 16 16 #include <linux/cc_platform.h> ··· 114 114 115 115 extern char __start_bss_decrypted[], __end_bss_decrypted[], __start_bss_decrypted_unused[]; 116 116 117 - #endif /* __ASSEMBLY__ */ 117 + #endif /* __ASSEMBLER__ */ 118 118 119 119 #endif /* __X86_MEM_ENCRYPT_H__ */
+2 -2
arch/x86/include/asm/msr.h
··· 4 4 5 5 #include "msr-index.h" 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 #include <asm/asm.h> 10 10 #include <asm/errno.h> ··· 397 397 return wrmsr_safe_regs(regs); 398 398 } 399 399 #endif /* CONFIG_SMP */ 400 - #endif /* __ASSEMBLY__ */ 400 + #endif /* __ASSEMBLER__ */ 401 401 #endif /* _ASM_X86_MSR_H */
+1 -1
arch/x86/include/asm/nops.h
··· 82 82 #define ASM_NOP7 _ASM_BYTES(BYTES_NOP7) 83 83 #define ASM_NOP8 _ASM_BYTES(BYTES_NOP8) 84 84 85 - #ifndef __ASSEMBLY__ 85 + #ifndef __ASSEMBLER__ 86 86 extern const unsigned char * const x86_nops[]; 87 87 #endif 88 88
+3 -3
arch/x86/include/asm/nospec-branch.h
··· 176 176 add $(BITS_PER_LONG/8), %_ASM_SP; \ 177 177 lfence; 178 178 179 - #ifdef __ASSEMBLY__ 179 + #ifdef __ASSEMBLER__ 180 180 181 181 /* 182 182 * (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions ··· 334 334 #define CLEAR_BRANCH_HISTORY_VMEXIT 335 335 #endif 336 336 337 - #else /* __ASSEMBLY__ */ 337 + #else /* __ASSEMBLER__ */ 338 338 339 339 typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE]; 340 340 extern retpoline_thunk_t __x86_indirect_thunk_array[]; ··· 603 603 mds_clear_cpu_buffers(); 604 604 } 605 605 606 - #endif /* __ASSEMBLY__ */ 606 + #endif /* __ASSEMBLER__ */ 607 607 608 608 #endif /* _ASM_X86_NOSPEC_BRANCH_H_ */
+2 -2
arch/x86/include/asm/orc_types.h
··· 45 45 #define ORC_TYPE_REGS 3 46 46 #define ORC_TYPE_REGS_PARTIAL 4 47 47 48 - #ifndef __ASSEMBLY__ 48 + #ifndef __ASSEMBLER__ 49 49 #include <asm/byteorder.h> 50 50 51 51 /* ··· 73 73 #endif 74 74 } __packed; 75 75 76 - #endif /* __ASSEMBLY__ */ 76 + #endif /* __ASSEMBLER__ */ 77 77 78 78 #endif /* _ORC_TYPES_H */
+2 -2
arch/x86/include/asm/page.h
··· 14 14 #include <asm/page_32.h> 15 15 #endif /* CONFIG_X86_64 */ 16 16 17 - #ifndef __ASSEMBLY__ 17 + #ifndef __ASSEMBLER__ 18 18 19 19 struct page; 20 20 ··· 84 84 return __canonical_address(vaddr, vaddr_bits) == vaddr; 85 85 } 86 86 87 - #endif /* __ASSEMBLY__ */ 87 + #endif /* __ASSEMBLER__ */ 88 88 89 89 #include <asm-generic/memory_model.h> 90 90 #include <asm-generic/getorder.h>
+2 -2
arch/x86/include/asm/page_32.h
··· 4 4 5 5 #include <asm/page_32_types.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 #define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET) 10 10 #ifdef CONFIG_DEBUG_VIRTUAL ··· 26 26 { 27 27 memcpy(to, from, PAGE_SIZE); 28 28 } 29 - #endif /* !__ASSEMBLY__ */ 29 + #endif /* !__ASSEMBLER__ */ 30 30 31 31 #endif /* _ASM_X86_PAGE_32_H */
+2 -2
arch/x86/include/asm/page_32_types.h
··· 63 63 */ 64 64 #define KERNEL_IMAGE_SIZE (512 * 1024 * 1024) 65 65 66 - #ifndef __ASSEMBLY__ 66 + #ifndef __ASSEMBLER__ 67 67 68 68 /* 69 69 * This much address space is reserved for vmalloc() and iomap() ··· 75 75 extern void find_low_pfn_range(void); 76 76 extern void setup_bootmem_allocator(void); 77 77 78 - #endif /* !__ASSEMBLY__ */ 78 + #endif /* !__ASSEMBLER__ */ 79 79 80 80 #endif /* _ASM_X86_PAGE_32_DEFS_H */
+2 -2
arch/x86/include/asm/page_64.h
··· 4 4 5 5 #include <asm/page_64_types.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 #include <asm/cpufeatures.h> 9 9 #include <asm/alternative.h> 10 10 ··· 95 95 } 96 96 #endif /* CONFIG_X86_5LEVEL */ 97 97 98 - #endif /* !__ASSEMBLY__ */ 98 + #endif /* !__ASSEMBLER__ */ 99 99 100 100 #ifdef CONFIG_X86_VSYSCALL_EMULATION 101 101 # define __HAVE_ARCH_GATE_AREA 1
+1 -1
arch/x86/include/asm/page_64_types.h
··· 2 2 #ifndef _ASM_X86_PAGE_64_DEFS_H 3 3 #define _ASM_X86_PAGE_64_DEFS_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <asm/kaslr.h> 7 7 #endif 8 8
+2 -2
arch/x86/include/asm/page_types.h
··· 43 43 #define IOREMAP_MAX_ORDER (PMD_SHIFT) 44 44 #endif /* CONFIG_X86_64 */ 45 45 46 - #ifndef __ASSEMBLY__ 46 + #ifndef __ASSEMBLER__ 47 47 48 48 #ifdef CONFIG_DYNAMIC_PHYSICAL_MASK 49 49 extern phys_addr_t physical_mask; ··· 66 66 67 67 extern void initmem_init(void); 68 68 69 - #endif /* !__ASSEMBLY__ */ 69 + #endif /* !__ASSEMBLER__ */ 70 70 71 71 #endif /* _ASM_X86_PAGE_DEFS_H */
+7 -7
arch/x86/include/asm/paravirt.h
··· 6 6 7 7 #include <asm/paravirt_types.h> 8 8 9 - #ifndef __ASSEMBLY__ 9 + #ifndef __ASSEMBLER__ 10 10 struct mm_struct; 11 11 #endif 12 12 ··· 15 15 #include <asm/asm.h> 16 16 #include <asm/nospec-branch.h> 17 17 18 - #ifndef __ASSEMBLY__ 18 + #ifndef __ASSEMBLER__ 19 19 #include <linux/bug.h> 20 20 #include <linux/types.h> 21 21 #include <linux/cpumask.h> ··· 715 715 extern void default_banner(void); 716 716 void native_pv_lock_init(void) __init; 717 717 718 - #else /* __ASSEMBLY__ */ 718 + #else /* __ASSEMBLER__ */ 719 719 720 720 #ifdef CONFIG_X86_64 721 721 #ifdef CONFIG_PARAVIRT_XXL ··· 735 735 #endif /* CONFIG_PARAVIRT_XXL */ 736 736 #endif /* CONFIG_X86_64 */ 737 737 738 - #endif /* __ASSEMBLY__ */ 738 + #endif /* __ASSEMBLER__ */ 739 739 #else /* CONFIG_PARAVIRT */ 740 740 # define default_banner x86_init_noop 741 741 742 - #ifndef __ASSEMBLY__ 742 + #ifndef __ASSEMBLER__ 743 743 static inline void native_pv_lock_init(void) 744 744 { 745 745 } 746 746 #endif 747 747 #endif /* !CONFIG_PARAVIRT */ 748 748 749 - #ifndef __ASSEMBLY__ 749 + #ifndef __ASSEMBLER__ 750 750 #ifndef CONFIG_PARAVIRT_XXL 751 751 static inline void paravirt_enter_mmap(struct mm_struct *mm) 752 752 { ··· 764 764 { 765 765 } 766 766 #endif 767 - #endif /* __ASSEMBLY__ */ 767 + #endif /* __ASSEMBLER__ */ 768 768 #endif /* _ASM_X86_PARAVIRT_H */
+2 -2
arch/x86/include/asm/paravirt_types.h
··· 4 4 5 5 #ifdef CONFIG_PARAVIRT 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 #include <linux/types.h> 9 9 10 10 #include <asm/desc_defs.h> ··· 525 525 526 526 #define paravirt_nop ((void *)nop_func) 527 527 528 - #endif /* __ASSEMBLY__ */ 528 + #endif /* __ASSEMBLER__ */ 529 529 530 530 #define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV) 531 531
+2 -2
arch/x86/include/asm/percpu.h
··· 10 10 # define __percpu_rel 11 11 #endif 12 12 13 - #ifdef __ASSEMBLY__ 13 + #ifdef __ASSEMBLER__ 14 14 15 15 #ifdef CONFIG_SMP 16 16 # define __percpu %__percpu_seg: ··· 588 588 /* We can use this directly for local CPU (faster). */ 589 589 DECLARE_PER_CPU_CACHE_HOT(unsigned long, this_cpu_off); 590 590 591 - #endif /* !__ASSEMBLY__ */ 591 + #endif /* !__ASSEMBLER__ */ 592 592 593 593 #ifdef CONFIG_SMP 594 594
+2 -2
arch/x86/include/asm/pgtable-2level_types.h
··· 2 2 #ifndef _ASM_X86_PGTABLE_2LEVEL_DEFS_H 3 3 #define _ASM_X86_PGTABLE_2LEVEL_DEFS_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/types.h> 7 7 8 8 typedef unsigned long pteval_t; ··· 16 16 pteval_t pte; 17 17 pteval_t pte_low; 18 18 } pte_t; 19 - #endif /* !__ASSEMBLY__ */ 19 + #endif /* !__ASSEMBLER__ */ 20 20 21 21 #define SHARED_KERNEL_PMD 0 22 22
+2 -2
arch/x86/include/asm/pgtable-3level_types.h
··· 2 2 #ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H 3 3 #define _ASM_X86_PGTABLE_3LEVEL_DEFS_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/types.h> 7 7 8 8 typedef u64 pteval_t; ··· 25 25 }; 26 26 pmdval_t pmd; 27 27 } pmd_t; 28 - #endif /* !__ASSEMBLY__ */ 28 + #endif /* !__ASSEMBLER__ */ 29 29 30 30 #define SHARED_KERNEL_PMD (!static_cpu_has(X86_FEATURE_PTI)) 31 31
+2 -2
arch/x86/include/asm/pgtable-invert.h
··· 2 2 #ifndef _ASM_PGTABLE_INVERT_H 3 3 #define _ASM_PGTABLE_INVERT_H 1 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 7 7 /* 8 8 * A clear pte value is special, and doesn't get inverted. ··· 36 36 return val; 37 37 } 38 38 39 - #endif /* __ASSEMBLY__ */ 39 + #endif /* __ASSEMBLER__ */ 40 40 41 41 #endif
+6 -6
arch/x86/include/asm/pgtable.h
··· 15 15 cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS))) \ 16 16 : (prot)) 17 17 18 - #ifndef __ASSEMBLY__ 18 + #ifndef __ASSEMBLER__ 19 19 #include <linux/spinlock.h> 20 20 #include <asm/x86_init.h> 21 21 #include <asm/pkru.h> ··· 973 973 } 974 974 #endif /* CONFIG_MITIGATION_PAGE_TABLE_ISOLATION */ 975 975 976 - #endif /* __ASSEMBLY__ */ 976 + #endif /* __ASSEMBLER__ */ 977 977 978 978 979 979 #ifdef CONFIG_X86_32 ··· 982 982 # include <asm/pgtable_64.h> 983 983 #endif 984 984 985 - #ifndef __ASSEMBLY__ 985 + #ifndef __ASSEMBLER__ 986 986 #include <linux/mm_types.h> 987 987 #include <linux/mmdebug.h> 988 988 #include <linux/log2.h> ··· 1233 1233 } 1234 1234 #endif /* CONFIG_PGTABLE_LEVELS > 4 */ 1235 1235 1236 - #endif /* __ASSEMBLY__ */ 1236 + #endif /* __ASSEMBLER__ */ 1237 1237 1238 1238 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET) 1239 1239 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY) 1240 1240 1241 - #ifndef __ASSEMBLY__ 1241 + #ifndef __ASSEMBLER__ 1242 1242 1243 1243 extern int direct_gbpages; 1244 1244 void init_mem_mapping(void); ··· 1812 1812 WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \ 1813 1813 set_pgd(pgdp, pgd); \ 1814 1814 }) 1815 - #endif /* __ASSEMBLY__ */ 1815 + #endif /* __ASSEMBLER__ */ 1816 1816 1817 1817 #endif /* _ASM_X86_PGTABLE_H */
+2 -2
arch/x86/include/asm/pgtable_32.h
··· 13 13 * This file contains the functions and defines necessary to modify and use 14 14 * the i386 page table tree. 15 15 */ 16 - #ifndef __ASSEMBLY__ 16 + #ifndef __ASSEMBLER__ 17 17 #include <asm/processor.h> 18 18 #include <linux/threads.h> 19 19 #include <asm/paravirt.h> ··· 45 45 flush_tlb_one_kernel((vaddr)); \ 46 46 } while (0) 47 47 48 - #endif /* !__ASSEMBLY__ */ 48 + #endif /* !__ASSEMBLER__ */ 49 49 50 50 /* 51 51 * This is used to calculate the .brk reservation for initial pagetables.
+1 -1
arch/x86/include/asm/pgtable_32_areas.h
··· 13 13 */ 14 14 #define VMALLOC_OFFSET (8 * 1024 * 1024) 15 15 16 - #ifndef __ASSEMBLY__ 16 + #ifndef __ASSEMBLER__ 17 17 extern bool __vmalloc_start_set; /* set once high_memory is set */ 18 18 #endif 19 19
+3 -3
arch/x86/include/asm/pgtable_64.h
··· 5 5 #include <linux/const.h> 6 6 #include <asm/pgtable_64_types.h> 7 7 8 - #ifndef __ASSEMBLY__ 8 + #ifndef __ASSEMBLER__ 9 9 10 10 /* 11 11 * This file contains the functions and defines necessary to modify and use ··· 270 270 271 271 #include <asm/pgtable-invert.h> 272 272 273 - #else /* __ASSEMBLY__ */ 273 + #else /* __ASSEMBLER__ */ 274 274 275 275 #define l4_index(x) (((x) >> 39) & 511) 276 276 #define pud_index(x) (((x) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)) ··· 291 291 i = i + 1 ; \ 292 292 .endr 293 293 294 - #endif /* __ASSEMBLY__ */ 294 + #endif /* __ASSEMBLER__ */ 295 295 #endif /* _ASM_X86_PGTABLE_64_H */
+2 -2
arch/x86/include/asm/pgtable_64_types.h
··· 4 4 5 5 #include <asm/sparsemem.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 #include <linux/types.h> 9 9 #include <asm/kaslr.h> 10 10 ··· 44 44 extern unsigned int pgdir_shift; 45 45 extern unsigned int ptrs_per_p4d; 46 46 47 - #endif /* !__ASSEMBLY__ */ 47 + #endif /* !__ASSEMBLER__ */ 48 48 49 49 #define SHARED_KERNEL_PMD 0 50 50
+5 -5
arch/x86/include/asm/pgtable_types.h
··· 166 166 * to have the WB mode at index 0 (all bits clear). This is the default 167 167 * right now and likely would break too much if changed. 168 168 */ 169 - #ifndef __ASSEMBLY__ 169 + #ifndef __ASSEMBLER__ 170 170 enum page_cache_mode { 171 171 _PAGE_CACHE_MODE_WB = 0, 172 172 _PAGE_CACHE_MODE_WC = 1, ··· 241 241 #define __PAGE_KERNEL_IO_NOCACHE __PAGE_KERNEL_NOCACHE 242 242 243 243 244 - #ifndef __ASSEMBLY__ 244 + #ifndef __ASSEMBLER__ 245 245 246 246 #define __PAGE_KERNEL_ENC (__PAGE_KERNEL | _ENC) 247 247 #define __PAGE_KERNEL_ENC_WP (__PAGE_KERNEL_WP | _ENC) ··· 264 264 #define PAGE_KERNEL_IO __pgprot_mask(__PAGE_KERNEL_IO) 265 265 #define PAGE_KERNEL_IO_NOCACHE __pgprot_mask(__PAGE_KERNEL_IO_NOCACHE) 266 266 267 - #endif /* __ASSEMBLY__ */ 267 + #endif /* __ASSEMBLER__ */ 268 268 269 269 /* 270 270 * early identity mapping pte attrib macros. ··· 283 283 # include <asm/pgtable_64_types.h> 284 284 #endif 285 285 286 - #ifndef __ASSEMBLY__ 286 + #ifndef __ASSEMBLER__ 287 287 288 288 #include <linux/types.h> 289 289 ··· 582 582 unsigned long page_flags); 583 583 extern int __init kernel_unmap_pages_in_pgd(pgd_t *pgd, unsigned long address, 584 584 unsigned long numpages); 585 - #endif /* !__ASSEMBLY__ */ 585 + #endif /* !__ASSEMBLER__ */ 586 586 587 587 #endif /* _ASM_X86_PGTABLE_DEFS_H */
+2 -2
arch/x86/include/asm/prom.h
··· 8 8 9 9 #ifndef _ASM_X86_PROM_H 10 10 #define _ASM_X86_PROM_H 11 - #ifndef __ASSEMBLY__ 11 + #ifndef __ASSEMBLER__ 12 12 13 13 #include <linux/of.h> 14 14 #include <linux/types.h> ··· 33 33 34 34 extern char cmd_line[COMMAND_LINE_SIZE]; 35 35 36 - #endif /* __ASSEMBLY__ */ 36 + #endif /* __ASSEMBLER__ */ 37 37 #endif
+2 -2
arch/x86/include/asm/pti.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _ASM_X86_PTI_H 3 3 #define _ASM_X86_PTI_H 4 - #ifndef __ASSEMBLY__ 4 + #ifndef __ASSEMBLER__ 5 5 6 6 #ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION 7 7 extern void pti_init(void); ··· 11 11 static inline void pti_check_boottime_disable(void) { } 12 12 #endif 13 13 14 - #endif /* __ASSEMBLY__ */ 14 + #endif /* __ASSEMBLER__ */ 15 15 #endif /* _ASM_X86_PTI_H */
+2 -2
arch/x86/include/asm/ptrace.h
··· 6 6 #include <asm/page_types.h> 7 7 #include <uapi/asm/ptrace.h> 8 8 9 - #ifndef __ASSEMBLY__ 9 + #ifndef __ASSEMBLER__ 10 10 #ifdef __i386__ 11 11 12 12 struct pt_regs { ··· 469 469 # define do_set_thread_area_64(p, s, t) (0) 470 470 #endif 471 471 472 - #endif /* !__ASSEMBLY__ */ 472 + #endif /* !__ASSEMBLER__ */ 473 473 #endif /* _ASM_X86_PTRACE_H */
+2 -2
arch/x86/include/asm/purgatory.h
··· 2 2 #ifndef _ASM_X86_PURGATORY_H 3 3 #define _ASM_X86_PURGATORY_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/purgatory.h> 7 7 8 8 extern void purgatory(void); 9 - #endif /* __ASSEMBLY__ */ 9 + #endif /* __ASSEMBLER__ */ 10 10 11 11 #endif /* _ASM_PURGATORY_H */
+2 -2
arch/x86/include/asm/pvclock-abi.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _ASM_X86_PVCLOCK_ABI_H 3 3 #define _ASM_X86_PVCLOCK_ABI_H 4 - #ifndef __ASSEMBLY__ 4 + #ifndef __ASSEMBLER__ 5 5 6 6 /* 7 7 * These structs MUST NOT be changed. ··· 44 44 #define PVCLOCK_GUEST_STOPPED (1 << 1) 45 45 /* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */ 46 46 #define PVCLOCK_COUNTS_FROM_ZERO (1 << 2) 47 - #endif /* __ASSEMBLY__ */ 47 + #endif /* __ASSEMBLER__ */ 48 48 #endif /* _ASM_X86_PVCLOCK_ABI_H */
+2 -2
arch/x86/include/asm/realmode.h
··· 9 9 #define TH_FLAGS_SME_ACTIVE_BIT 0 10 10 #define TH_FLAGS_SME_ACTIVE BIT(TH_FLAGS_SME_ACTIVE_BIT) 11 11 12 - #ifndef __ASSEMBLY__ 12 + #ifndef __ASSEMBLER__ 13 13 14 14 #include <linux/types.h> 15 15 #include <asm/io.h> ··· 95 95 void load_trampoline_pgtable(void); 96 96 void init_real_mode(void); 97 97 98 - #endif /* __ASSEMBLY__ */ 98 + #endif /* __ASSEMBLER__ */ 99 99 100 100 #endif /* _ARCH_X86_REALMODE_H */
+4 -4
arch/x86/include/asm/segment.h
··· 233 233 #define VDSO_CPUNODE_BITS 12 234 234 #define VDSO_CPUNODE_MASK 0xfff 235 235 236 - #ifndef __ASSEMBLY__ 236 + #ifndef __ASSEMBLER__ 237 237 238 238 /* Helper functions to store/load CPU and node numbers */ 239 239 ··· 265 265 *node = (p >> VDSO_CPUNODE_BITS); 266 266 } 267 267 268 - #endif /* !__ASSEMBLY__ */ 268 + #endif /* !__ASSEMBLER__ */ 269 269 270 270 #ifdef __KERNEL__ 271 271 ··· 286 286 */ 287 287 #define XEN_EARLY_IDT_HANDLER_SIZE (8 + ENDBR_INSN_SIZE) 288 288 289 - #ifndef __ASSEMBLY__ 289 + #ifndef __ASSEMBLER__ 290 290 291 291 extern const char early_idt_handler_array[NUM_EXCEPTION_VECTORS][EARLY_IDT_HANDLER_SIZE]; 292 292 extern void early_ignore_irq(void); ··· 350 350 #define savesegment(seg, value) \ 351 351 asm("mov %%" #seg ",%0":"=r" (value) : : "memory") 352 352 353 - #endif /* !__ASSEMBLY__ */ 353 + #endif /* !__ASSEMBLER__ */ 354 354 #endif /* __KERNEL__ */ 355 355 356 356 #endif /* _ASM_X86_SEGMENT_H */
+3 -3
arch/x86/include/asm/setup.h
··· 27 27 #define OLD_CL_ADDRESS 0x020 /* Relative to real mode data */ 28 28 #define NEW_CL_POINTER 0x228 /* Relative to real mode data */ 29 29 30 - #ifndef __ASSEMBLY__ 30 + #ifndef __ASSEMBLER__ 31 31 #include <linux/cache.h> 32 32 33 33 #include <asm/bootparam.h> ··· 142 142 #define builtin_cmdline_added 0 143 143 #endif 144 144 145 - #else /* __ASSEMBLY */ 145 + #else /* __ASSEMBLER__ */ 146 146 147 147 .macro __RESERVE_BRK name, size 148 148 .pushsection .bss..brk, "aw" ··· 154 154 155 155 #define RESERVE_BRK(name, size) __RESERVE_BRK name, size 156 156 157 - #endif /* __ASSEMBLY__ */ 157 + #endif /* __ASSEMBLER__ */ 158 158 159 159 #endif /* _ASM_X86_SETUP_H */
+2 -2
arch/x86/include/asm/setup_data.h
··· 4 4 5 5 #include <uapi/asm/setup_data.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 struct pci_setup_rom { 10 10 struct setup_data data; ··· 27 27 u64 reserved[8]; 28 28 }; 29 29 30 - #endif /* __ASSEMBLY__ */ 30 + #endif /* __ASSEMBLER__ */ 31 31 32 32 #endif /* _ASM_X86_SETUP_DATA_H */
+2 -2
arch/x86/include/asm/shared/tdx.h
··· 106 106 #define TDX_PS_1G 2 107 107 #define TDX_PS_NR (TDX_PS_1G + 1) 108 108 109 - #ifndef __ASSEMBLY__ 109 + #ifndef __ASSEMBLER__ 110 110 111 111 #include <linux/compiler_attributes.h> 112 112 ··· 177 177 return exit_reason; 178 178 } 179 179 180 - #endif /* !__ASSEMBLY__ */ 180 + #endif /* !__ASSEMBLER__ */ 181 181 #endif /* _ASM_X86_SHARED_TDX_H */
+2 -2
arch/x86/include/asm/shstk.h
··· 2 2 #ifndef _ASM_X86_SHSTK_H 3 3 #define _ASM_X86_SHSTK_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/types.h> 7 7 8 8 struct task_struct; ··· 37 37 static inline bool shstk_is_enabled(void) { return false; } 38 38 #endif /* CONFIG_X86_USER_SHADOW_STACK */ 39 39 40 - #endif /* __ASSEMBLY__ */ 40 + #endif /* __ASSEMBLER__ */ 41 41 42 42 #endif /* _ASM_X86_SHSTK_H */
+4 -4
arch/x86/include/asm/signal.h
··· 2 2 #ifndef _ASM_X86_SIGNAL_H 3 3 #define _ASM_X86_SIGNAL_H 4 4 5 - #ifndef __ASSEMBLY__ 5 + #ifndef __ASSEMBLER__ 6 6 #include <linux/linkage.h> 7 7 8 8 /* Most things should be clean enough to redefine this at will, if care ··· 28 28 #define SA_IA32_ABI 0x02000000u 29 29 #define SA_X32_ABI 0x01000000u 30 30 31 - #endif /* __ASSEMBLY__ */ 31 + #endif /* __ASSEMBLER__ */ 32 32 #include <uapi/asm/signal.h> 33 - #ifndef __ASSEMBLY__ 33 + #ifndef __ASSEMBLER__ 34 34 35 35 #define __ARCH_HAS_SA_RESTORER 36 36 ··· 101 101 102 102 #endif /* !__i386__ */ 103 103 104 - #endif /* __ASSEMBLY__ */ 104 + #endif /* __ASSEMBLER__ */ 105 105 #endif /* _ASM_X86_SIGNAL_H */
+3 -3
arch/x86/include/asm/smap.h
··· 13 13 #include <asm/cpufeatures.h> 14 14 #include <asm/alternative.h> 15 15 16 - #ifdef __ASSEMBLY__ 16 + #ifdef __ASSEMBLER__ 17 17 18 18 #define ASM_CLAC \ 19 19 ALTERNATIVE "", "clac", X86_FEATURE_SMAP ··· 21 21 #define ASM_STAC \ 22 22 ALTERNATIVE "", "stac", X86_FEATURE_SMAP 23 23 24 - #else /* __ASSEMBLY__ */ 24 + #else /* __ASSEMBLER__ */ 25 25 26 26 static __always_inline void clac(void) 27 27 { ··· 61 61 #define ASM_STAC \ 62 62 ALTERNATIVE("", "stac", X86_FEATURE_SMAP) 63 63 64 - #endif /* __ASSEMBLY__ */ 64 + #endif /* __ASSEMBLER__ */ 65 65 66 66 #endif /* _ASM_X86_SMAP_H */
+2 -2
arch/x86/include/asm/smp.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _ASM_X86_SMP_H 3 3 #define _ASM_X86_SMP_H 4 - #ifndef __ASSEMBLY__ 4 + #ifndef __ASSEMBLER__ 5 5 #include <linux/cpumask.h> 6 6 #include <linux/thread_info.h> 7 7 ··· 171 171 extern unsigned int smpboot_control; 172 172 extern unsigned long apic_mmio_base; 173 173 174 - #endif /* !__ASSEMBLY__ */ 174 + #endif /* !__ASSEMBLER__ */ 175 175 176 176 /* Control bits for startup_64 */ 177 177 #define STARTUP_READ_APICID 0x80000000
+2 -2
arch/x86/include/asm/tdx.h
··· 30 30 #define TDX_SUCCESS 0ULL 31 31 #define TDX_RND_NO_ENTROPY 0x8000020300000000ULL 32 32 33 - #ifndef __ASSEMBLY__ 33 + #ifndef __ASSEMBLER__ 34 34 35 35 #include <uapi/asm/mce.h> 36 36 ··· 126 126 static inline const char *tdx_dump_mce_info(struct mce *m) { return NULL; } 127 127 #endif /* CONFIG_INTEL_TDX_HOST */ 128 128 129 - #endif /* !__ASSEMBLY__ */ 129 + #endif /* !__ASSEMBLER__ */ 130 130 #endif /* _ASM_X86_TDX_H */
+6 -6
arch/x86/include/asm/thread_info.h
··· 54 54 * - this struct should fit entirely inside of one cache line 55 55 * - this struct shares the supervisor stack pages 56 56 */ 57 - #ifndef __ASSEMBLY__ 57 + #ifndef __ASSEMBLER__ 58 58 struct task_struct; 59 59 #include <asm/cpufeature.h> 60 60 #include <linux/atomic.h> ··· 73 73 .flags = 0, \ 74 74 } 75 75 76 - #else /* !__ASSEMBLY__ */ 76 + #else /* !__ASSEMBLER__ */ 77 77 78 78 #include <asm/asm-offsets.h> 79 79 ··· 161 161 * 162 162 * preempt_count needs to be 1 initially, until the scheduler is functional. 163 163 */ 164 - #ifndef __ASSEMBLY__ 164 + #ifndef __ASSEMBLER__ 165 165 166 166 /* 167 167 * Walks up the stack frames to make sure that the specified object is ··· 213 213 #endif 214 214 } 215 215 216 - #endif /* !__ASSEMBLY__ */ 216 + #endif /* !__ASSEMBLER__ */ 217 217 218 218 /* 219 219 * Thread-synchronous status. ··· 224 224 */ 225 225 #define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/ 226 226 227 - #ifndef __ASSEMBLY__ 227 + #ifndef __ASSEMBLER__ 228 228 #ifdef CONFIG_COMPAT 229 229 #define TS_I386_REGS_POKED 0x0004 /* regs poked by 32-bit ptracer */ 230 230 ··· 242 242 243 243 extern void arch_setup_new_exec(void); 244 244 #define arch_setup_new_exec arch_setup_new_exec 245 - #endif /* !__ASSEMBLY__ */ 245 + #endif /* !__ASSEMBLER__ */ 246 246 247 247 #endif /* _ASM_X86_THREAD_INFO_H */
+2 -2
arch/x86/include/asm/unwind_hints.h
··· 5 5 6 6 #include "orc_types.h" 7 7 8 - #ifdef __ASSEMBLY__ 8 + #ifdef __ASSEMBLER__ 9 9 10 10 .macro UNWIND_HINT_END_OF_STACK 11 11 UNWIND_HINT type=UNWIND_HINT_TYPE_END_OF_STACK ··· 88 88 #define UNWIND_HINT_RESTORE \ 89 89 UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0) 90 90 91 - #endif /* __ASSEMBLY__ */ 91 + #endif /* __ASSEMBLER__ */ 92 92 93 93 #endif /* _ASM_X86_UNWIND_HINTS_H */
+2 -2
arch/x86/include/asm/vdso/getrandom.h
··· 5 5 #ifndef __ASM_VDSO_GETRANDOM_H 6 6 #define __ASM_VDSO_GETRANDOM_H 7 7 8 - #ifndef __ASSEMBLY__ 8 + #ifndef __ASSEMBLER__ 9 9 10 10 #include <asm/unistd.h> 11 11 ··· 37 37 return &vdso_rng_data; 38 38 } 39 39 40 - #endif /* !__ASSEMBLY__ */ 40 + #endif /* !__ASSEMBLER__ */ 41 41 42 42 #endif /* __ASM_VDSO_GETRANDOM_H */
+2 -2
arch/x86/include/asm/vdso/gettimeofday.h
··· 10 10 #ifndef __ASM_VDSO_GETTIMEOFDAY_H 11 11 #define __ASM_VDSO_GETTIMEOFDAY_H 12 12 13 - #ifndef __ASSEMBLY__ 13 + #ifndef __ASSEMBLER__ 14 14 15 15 #include <uapi/linux/time.h> 16 16 #include <asm/vgtod.h> ··· 350 350 } 351 351 #define vdso_calc_ns vdso_calc_ns 352 352 353 - #endif /* !__ASSEMBLY__ */ 353 + #endif /* !__ASSEMBLER__ */ 354 354 355 355 #endif /* __ASM_VDSO_GETTIMEOFDAY_H */
+2 -2
arch/x86/include/asm/vdso/processor.h
··· 5 5 #ifndef __ASM_VDSO_PROCESSOR_H 6 6 #define __ASM_VDSO_PROCESSOR_H 7 7 8 - #ifndef __ASSEMBLY__ 8 + #ifndef __ASSEMBLER__ 9 9 10 10 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ 11 11 static __always_inline void rep_nop(void) ··· 22 22 23 23 notrace long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused); 24 24 25 - #endif /* __ASSEMBLY__ */ 25 + #endif /* __ASSEMBLER__ */ 26 26 27 27 #endif /* __ASM_VDSO_PROCESSOR_H */
+2 -2
arch/x86/include/asm/vdso/vsyscall.h
··· 9 9 #define VDSO_PAGE_PVCLOCK_OFFSET 0 10 10 #define VDSO_PAGE_HVCLOCK_OFFSET 1 11 11 12 - #ifndef __ASSEMBLY__ 12 + #ifndef __ASSEMBLER__ 13 13 14 14 #include <vdso/datapage.h> 15 15 #include <asm/vgtod.h> ··· 36 36 /* The asm-generic header needs to be included after the definitions above */ 37 37 #include <asm-generic/vdso/vsyscall.h> 38 38 39 - #endif /* !__ASSEMBLY__ */ 39 + #endif /* !__ASSEMBLER__ */ 40 40 41 41 #endif /* __ASM_VDSO_VSYSCALL_H */
+5 -5
arch/x86/include/asm/xen/interface.h
··· 72 72 #endif 73 73 #endif 74 74 75 - #ifndef __ASSEMBLY__ 75 + #ifndef __ASSEMBLER__ 76 76 /* Explicitly size integers that represent pfns in the public interface 77 77 * with Xen so that on ARM we can have one ABI that works for 32 and 64 78 78 * bit guests. */ ··· 137 137 #define TI_SET_DPL(_ti, _dpl) ((_ti)->flags |= (_dpl)) 138 138 #define TI_SET_IF(_ti, _if) ((_ti)->flags |= ((!!(_if))<<2)) 139 139 140 - #ifndef __ASSEMBLY__ 140 + #ifndef __ASSEMBLER__ 141 141 struct trap_info { 142 142 uint8_t vector; /* exception vector */ 143 143 uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */ ··· 186 186 uint32_t wc_sec_hi; 187 187 #endif 188 188 }; 189 - #endif /* !__ASSEMBLY__ */ 189 + #endif /* !__ASSEMBLER__ */ 190 190 191 191 #ifdef CONFIG_X86_32 192 192 #include <asm/xen/interface_32.h> ··· 196 196 197 197 #include <asm/pvclock-abi.h> 198 198 199 - #ifndef __ASSEMBLY__ 199 + #ifndef __ASSEMBLER__ 200 200 /* 201 201 * The following is all CPU context. Note that the fpu_ctxt block is filled 202 202 * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. ··· 376 376 } c; 377 377 }; 378 378 379 - #endif /* !__ASSEMBLY__ */ 379 + #endif /* !__ASSEMBLER__ */ 380 380 381 381 /* 382 382 * Prefix forces emulation of some non-trapping instructions.
+2 -2
arch/x86/include/asm/xen/interface_32.h
··· 44 44 */ 45 45 #define __HYPERVISOR_VIRT_START 0xF5800000 46 46 47 - #ifndef __ASSEMBLY__ 47 + #ifndef __ASSEMBLER__ 48 48 49 49 struct cpu_user_regs { 50 50 uint32_t ebx; ··· 85 85 86 86 #define XEN_CALLBACK(__cs, __eip) \ 87 87 ((struct xen_callback){ .cs = (__cs), .eip = (unsigned long)(__eip) }) 88 - #endif /* !__ASSEMBLY__ */ 88 + #endif /* !__ASSEMBLER__ */ 89 89 90 90 91 91 /*
+2 -2
arch/x86/include/asm/xen/interface_64.h
··· 77 77 #define VGCF_in_syscall (1<<_VGCF_in_syscall) 78 78 #define VGCF_IN_SYSCALL VGCF_in_syscall 79 79 80 - #ifndef __ASSEMBLY__ 80 + #ifndef __ASSEMBLER__ 81 81 82 82 struct iret_context { 83 83 /* Top of stack (%rsp at point of hypercall). */ ··· 143 143 #define XEN_CALLBACK(__cs, __rip) \ 144 144 ((unsigned long)(__rip)) 145 145 146 - #endif /* !__ASSEMBLY__ */ 146 + #endif /* !__ASSEMBLER__ */ 147 147 148 148 149 149 #endif /* _ASM_X86_XEN_INTERFACE_64_H */
+1 -1
arch/x86/math-emu/control_w.h
··· 11 11 #ifndef _CONTROLW_H_ 12 12 #define _CONTROLW_H_ 13 13 14 - #ifdef __ASSEMBLY__ 14 + #ifdef __ASSEMBLER__ 15 15 #define _Const_(x) $##x 16 16 #else 17 17 #define _Const_(x) x
+3 -3
arch/x86/math-emu/exception.h
··· 10 10 #ifndef _EXCEPTION_H_ 11 11 #define _EXCEPTION_H_ 12 12 13 - #ifdef __ASSEMBLY__ 13 + #ifdef __ASSEMBLER__ 14 14 #define Const_(x) $##x 15 15 #else 16 16 #define Const_(x) x ··· 37 37 #define PRECISION_LOST_UP Const_((EX_Precision | SW_C1)) 38 38 #define PRECISION_LOST_DOWN Const_(EX_Precision) 39 39 40 - #ifndef __ASSEMBLY__ 40 + #ifndef __ASSEMBLER__ 41 41 42 42 #ifdef DEBUG 43 43 #define EXCEPTION(x) { printk("exception in %s at line %d\n", \ ··· 46 46 #define EXCEPTION(x) FPU_exception(x) 47 47 #endif 48 48 49 - #endif /* __ASSEMBLY__ */ 49 + #endif /* __ASSEMBLER__ */ 50 50 51 51 #endif /* _EXCEPTION_H_ */
+3 -3
arch/x86/math-emu/fpu_emu.h
··· 20 20 */ 21 21 #define PECULIAR_486 22 22 23 - #ifdef __ASSEMBLY__ 23 + #ifdef __ASSEMBLER__ 24 24 #include "fpu_asm.h" 25 25 #define Const(x) $##x 26 26 #else ··· 68 68 69 69 #define FPU_Exception Const(0x80000000) /* Added to tag returns. */ 70 70 71 - #ifndef __ASSEMBLY__ 71 + #ifndef __ASSEMBLER__ 72 72 73 73 #include "fpu_system.h" 74 74 ··· 213 213 #include "fpu_proto.h" 214 214 #endif 215 215 216 - #endif /* __ASSEMBLY__ */ 216 + #endif /* __ASSEMBLER__ */ 217 217 218 218 #endif /* _FPU_EMU_H_ */
+3 -3
arch/x86/math-emu/status_w.h
··· 13 13 14 14 #include "fpu_emu.h" /* for definition of PECULIAR_486 */ 15 15 16 - #ifdef __ASSEMBLY__ 16 + #ifdef __ASSEMBLER__ 17 17 #define Const__(x) $##x 18 18 #else 19 19 #define Const__(x) x ··· 37 37 38 38 #define SW_Exc_Mask Const__(0x27f) /* Status word exception bit mask */ 39 39 40 - #ifndef __ASSEMBLY__ 40 + #ifndef __ASSEMBLER__ 41 41 42 42 #define COMP_A_gt_B 1 43 43 #define COMP_A_eq_B 2 ··· 63 63 # define clear_C1() 64 64 #endif /* PECULIAR_486 */ 65 65 66 - #endif /* __ASSEMBLY__ */ 66 + #endif /* __ASSEMBLER__ */ 67 67 68 68 #endif /* _STATUS_H_ */
+2 -2
arch/x86/realmode/rm/realmode.h
··· 2 2 #ifndef ARCH_X86_REALMODE_RM_REALMODE_H 3 3 #define ARCH_X86_REALMODE_RM_REALMODE_H 4 4 5 - #ifdef __ASSEMBLY__ 5 + #ifdef __ASSEMBLER__ 6 6 7 7 /* 8 8 * 16-bit ljmpw to the real_mode_seg ··· 12 12 */ 13 13 #define LJMPW_RM(to) .byte 0xea ; .word (to), real_mode_seg 14 14 15 - #endif /* __ASSEMBLY__ */ 15 + #endif /* __ASSEMBLER__ */ 16 16 17 17 /* 18 18 * Signature at the end of the realmode region
+1 -1
arch/x86/realmode/rm/wakeup.h
··· 7 7 #ifndef ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H 8 8 #define ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H 9 9 10 - #ifndef __ASSEMBLY__ 10 + #ifndef __ASSEMBLER__ 11 11 #include <linux/types.h> 12 12 13 13 /* This must match data at wakeup.S */
+4 -4
tools/arch/x86/include/asm/asm.h
··· 2 2 #ifndef _ASM_X86_ASM_H 3 3 #define _ASM_X86_ASM_H 4 4 5 - #ifdef __ASSEMBLY__ 5 + #ifdef __ASSEMBLER__ 6 6 # define __ASM_FORM(x, ...) x,## __VA_ARGS__ 7 7 # define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__ 8 8 # define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__, ··· 123 123 #ifdef __KERNEL__ 124 124 125 125 /* Exception table entry */ 126 - #ifdef __ASSEMBLY__ 126 + #ifdef __ASSEMBLER__ 127 127 # define _ASM_EXTABLE_HANDLE(from, to, handler) \ 128 128 .pushsection "__ex_table","a" ; \ 129 129 .balign 4 ; \ ··· 154 154 # define _ASM_NOKPROBE(entry) 155 155 # endif 156 156 157 - #else /* ! __ASSEMBLY__ */ 157 + #else /* ! __ASSEMBLER__ */ 158 158 # define _EXPAND_EXTABLE_HANDLE(x) #x 159 159 # define _ASM_EXTABLE_HANDLE(from, to, handler) \ 160 160 " .pushsection \"__ex_table\",\"a\"\n" \ ··· 186 186 */ 187 187 register unsigned long current_stack_pointer asm(_ASM_SP); 188 188 #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) 189 - #endif /* __ASSEMBLY__ */ 189 + #endif /* __ASSEMBLER__ */ 190 190 191 191 #endif /* __KERNEL__ */ 192 192
+1 -1
tools/arch/x86/include/asm/nops.h
··· 82 82 #define ASM_NOP7 _ASM_BYTES(BYTES_NOP7) 83 83 #define ASM_NOP8 _ASM_BYTES(BYTES_NOP8) 84 84 85 - #ifndef __ASSEMBLY__ 85 + #ifndef __ASSEMBLER__ 86 86 extern const unsigned char * const x86_nops[]; 87 87 #endif 88 88
+2 -2
tools/arch/x86/include/asm/orc_types.h
··· 45 45 #define ORC_TYPE_REGS 3 46 46 #define ORC_TYPE_REGS_PARTIAL 4 47 47 48 - #ifndef __ASSEMBLY__ 48 + #ifndef __ASSEMBLER__ 49 49 #include <asm/byteorder.h> 50 50 51 51 /* ··· 73 73 #endif 74 74 } __packed; 75 75 76 - #endif /* __ASSEMBLY__ */ 76 + #endif /* __ASSEMBLER__ */ 77 77 78 78 #endif /* _ORC_TYPES_H */
+2 -2
tools/arch/x86/include/asm/pvclock-abi.h
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 #ifndef _ASM_X86_PVCLOCK_ABI_H 3 3 #define _ASM_X86_PVCLOCK_ABI_H 4 - #ifndef __ASSEMBLY__ 4 + #ifndef __ASSEMBLER__ 5 5 6 6 /* 7 7 * These structs MUST NOT be changed. ··· 44 44 #define PVCLOCK_GUEST_STOPPED (1 << 1) 45 45 /* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */ 46 46 #define PVCLOCK_COUNTS_FROM_ZERO (1 << 2) 47 - #endif /* __ASSEMBLY__ */ 47 + #endif /* __ASSEMBLER__ */ 48 48 #endif /* _ASM_X86_PVCLOCK_ABI_H */