From: Thomas Huth <thuth@redhat.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5] x86/headers: Replace __ASSEMBLY__ stragglers with __ASSEMBLER__
Date: Thu, 12 Feb 2026 20:12:11 +0100 [thread overview]
Message-ID: <effd7088-b8a1-4b86-a3ca-c2bc4addeaf0@redhat.com> (raw)
In-Reply-To: <20251218182029.166993-1-thuth@redhat.com>
On 18/12/2025 19.20, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> 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>
> ---
> v5: Fix new occurances in bug.h
Friendly ping!
Thomas
> arch/x86/include/asm/bug.h | 6 +++---
> arch/x86/include/asm/irqflags.h | 4 ++--
> arch/x86/include/asm/percpu.h | 2 +-
> arch/x86/include/asm/runtime-const.h | 6 +++---
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h
> index d561a8443c137..e9987061598b3 100644
> --- a/arch/x86/include/asm/bug.h
> +++ b/arch/x86/include/asm/bug.h
> @@ -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; \
> diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
> index b30e5474c18e1..5feaac1d235f0 100644
> --- a/arch/x86/include/asm/irqflags.h
> +++ b/arch/x86/include/asm/irqflags.h
> @@ -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
> diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
> index 725d0eff7acdf..50f73a8df7f6c 100644
> --- a/arch/x86/include/asm/percpu.h
> +++ b/arch/x86/include/asm/percpu.h
> @@ -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>
> diff --git a/arch/x86/include/asm/runtime-const.h b/arch/x86/include/asm/runtime-const.h
> index e5a13dc8816e2..4cd94fdcb45e2 100644
> --- a/arch/x86/include/asm/runtime-const.h
> +++ b/arch/x86/include/asm/runtime-const.h
> @@ -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
next prev parent reply other threads:[~2026-02-12 19:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-18 18:20 Thomas Huth
2026-02-12 19:12 ` Thomas Huth [this message]
2026-02-23 10:25 ` [tip: x86/urgent] " tip-bot2 for Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=effd7088-b8a1-4b86-a3ca-c2bc4addeaf0@redhat.com \
--to=thuth@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®