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

Configure Feed

Select the types of activity you want to include in your feed.

x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__

After converting the __ASSEMBLY__ statements to __ASSEMBLER__ in
commit 24a295e4ef1ca ("x86/headers: Replace __ASSEMBLY__ with
__ASSEMBLER__ in non-UAPI headers"), some new code has been
added that uses __ASSEMBLY__ again. Convert these stragglers, too.

This is a mechanical patch, done with a simple "sed -i" command.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20251218182029.166993-1-thuth@redhat.com

authored by

Thomas Huth and committed by
Peter Zijlstra 237dc6a0 24c8147a

+9 -9
+3 -3
arch/x86/include/asm/bug.h
··· 7 7 #include <linux/objtool.h> 8 8 #include <asm/asm.h> 9 9 10 - #ifndef __ASSEMBLY__ 10 + #ifndef __ASSEMBLER__ 11 11 struct bug_entry; 12 12 extern void __WARN_trap(struct bug_entry *bug, ...); 13 13 #endif ··· 137 137 138 138 #ifdef HAVE_ARCH_BUG_FORMAT_ARGS 139 139 140 - #ifndef __ASSEMBLY__ 140 + #ifndef __ASSEMBLER__ 141 141 #include <linux/static_call_types.h> 142 142 DECLARE_STATIC_CALL(WARN_trap, __WARN_trap); 143 143 ··· 153 153 struct sysv_va_list args; 154 154 }; 155 155 extern void *__warn_args(struct arch_va_list *args, struct pt_regs *regs); 156 - #endif /* __ASSEMBLY__ */ 156 + #endif /* __ASSEMBLER__ */ 157 157 158 158 #define __WARN_bug_entry(flags, format) ({ \ 159 159 struct bug_entry *bug; \
+2 -2
arch/x86/include/asm/irqflags.h
··· 77 77 #endif 78 78 79 79 #ifndef CONFIG_PARAVIRT 80 - #ifndef __ASSEMBLY__ 80 + #ifndef __ASSEMBLER__ 81 81 /* 82 82 * Used in the idle loop; sti takes one instruction cycle 83 83 * to complete: ··· 95 95 { 96 96 native_halt(); 97 97 } 98 - #endif /* __ASSEMBLY__ */ 98 + #endif /* __ASSEMBLER__ */ 99 99 #endif /* CONFIG_PARAVIRT */ 100 100 101 101 #ifdef CONFIG_PARAVIRT_XXL
+1 -1
arch/x86/include/asm/percpu.h
··· 20 20 21 21 #define PER_CPU_VAR(var) __percpu(var)__percpu_rel 22 22 23 - #else /* !__ASSEMBLY__: */ 23 + #else /* !__ASSEMBLER__: */ 24 24 25 25 #include <linux/args.h> 26 26 #include <linux/bits.h>
+3 -3
arch/x86/include/asm/runtime-const.h
··· 6 6 #error "Cannot use runtime-const infrastructure from modules" 7 7 #endif 8 8 9 - #ifdef __ASSEMBLY__ 9 + #ifdef __ASSEMBLER__ 10 10 11 11 .macro RUNTIME_CONST_PTR sym reg 12 12 movq $0x0123456789abcdef, %\reg ··· 16 16 .popsection 17 17 .endm 18 18 19 - #else /* __ASSEMBLY__ */ 19 + #else /* __ASSEMBLER__ */ 20 20 21 21 #define runtime_const_ptr(sym) ({ \ 22 22 typeof(sym) __ret; \ ··· 74 74 } 75 75 } 76 76 77 - #endif /* __ASSEMBLY__ */ 77 + #endif /* __ASSEMBLER__ */ 78 78 #endif