archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 01:04:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__

Browse source 
After converting the __ASSEMBLY__ statements to __ASSEMBLER__ in
commit 24a295e4ef ("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
This commit is contained in:
Thomas Huth 2025-12-18 19:20:29 +01:00 • committed by Peter Zijlstra
parent 24c8147abb
commit 237dc6a054
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/include/asm/bug.h
View file

@ -7,7 +7,7 @@
#include <linux/objtool.h>
#include <asm/asm.h>
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
struct bug_entry;
extern void __WARN_trap(struct bug_entry *bug, ...);
#endif
@ -137,7 +137,7 @@ do { \
#ifdef HAVE_ARCH_BUG_FORMAT_ARGS
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include <linux/static_call_types.h>
DECLARE_STATIC_CALL(WARN_trap, __WARN_trap);
@ -153,7 +153,7 @@ struct arch_va_list {
struct sysv_va_list args;
};
extern void *__warn_args(struct arch_va_list *args, struct pt_regs *regs);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#define __WARN_bug_entry(flags, format) ({ \
struct bug_entry *bug; \

4
arch/x86/include/asm/irqflags.h
View file

@ -77,7 +77,7 @@ static __always_inline void native_local_irq_restore(unsigned long flags)
#endif
#ifndef CONFIG_PARAVIRT
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
/*
* Used in the idle loop; sti takes one instruction cycle
* to complete:
@ -95,7 +95,7 @@ static __always_inline void halt(void)
{
native_halt();
}
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif /* CONFIG_PARAVIRT */
#ifdef CONFIG_PARAVIRT_XXL

2
arch/x86/include/asm/percpu.h
View file

@ -20,7 +20,7 @@
#define PER_CPU_VAR(var) __percpu(var)__percpu_rel
#else /* !__ASSEMBLY__: */
#else /* !__ASSEMBLER__: */
#include <linux/args.h>
#include <linux/bits.h>

6
arch/x86/include/asm/runtime-const.h
View file

@ -6,7 +6,7 @@
#error "Cannot use runtime-const infrastructure from modules"
#endif
#ifdef __ASSEMBLY__
#ifdef __ASSEMBLER__
.macro RUNTIME_CONST_PTR sym reg
movq $0x0123456789abcdef, %\reg
@ -16,7 +16,7 @@
.popsection
.endm
#else /* __ASSEMBLY__ */
#else /* __ASSEMBLER__ */
#define runtime_const_ptr(sym) ({ \
typeof(sym) __ret; \
@ -74,5 +74,5 @@ static inline void runtime_const_fixup(void (*fn)(void *, unsigned long),
}
}
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif