From: Thomas Huth <thuth@redhat.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
linux-arm-kernel@lists.infradead.org
Cc: Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev
Subject: [PATCH v2 0/2] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in headers
Date: Fri, 10 Oct 2025 15:01:14 +0200 [thread overview]
Message-ID: <20251010130116.828465-1-thuth@redhat.com> (raw)
The kernel Makefiles define the __ASSEMBLY__ macro to provide
a way to use headers in both, assembler and C source code.
However, all the supported versions of the GCC and Clang compilers
also define the macro __ASSEMBLER__ automatically already when compiling
assembler code, so some kernel headers are using __ASSEMBLER__ instead.
With regards to userspace code, this seems also to be constant source
of confusion, see for example these links here:
https://lore.kernel.org/kvm/20250222014526.2302653-1-seanjc@google.com/
https://stackoverflow.com/questions/28924355/gcc-assembler-preprocessor-not-compatible-with-standard-headers
https://forums.raspberrypi.com/viewtopic.php?p=1652944#p1653834
https://github.com/riscv-software-src/opensbi/issues/199
To avoid confusion in the future, it would make sense to standardize
on the macro that gets defined by the compiler, so this patch series
changes all occurances of __ASSEMBLY__ into __ASSEMBLER__.
I split the patches per architecture to ease the review, and I also
split the uapi headers from the normal ones in case we decide that
uapi needs to be treated differently from the normal headers here.
The related cleanup patches for x86, parisc, sh, arc, s390x and many
other architectures already got merged via their specific architecture
tree, see for example:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=24a295e4ef1ca8
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8a141be3233af7
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cccaea1d66e94b
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2b6a188625a2b
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9cc646950eefda
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=179e949719fe81
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2cb74be378675c
The x86 have already been merged in Linux v6.15, and as far as I know,
there haven't been any complaints about problems in userspace with the
updated uapi headers yet, so I think these changes should be fine.
Thus, please merge the arm64 patches via the arm64 tree. Thanks!
Thomas
v2:
- Split the arm64 patches from the global series
(see https://lore.kernel.org/all/20250314071013.1575167-1-thuth@redhat.com/)
- Rebased the patches on linux-next and fixed the conflicts
Thomas Huth (2):
arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
arch/arm64/include/asm/alternative-macros.h | 8 ++++----
arch/arm64/include/asm/alternative.h | 4 ++--
arch/arm64/include/asm/arch_gicv3.h | 4 ++--
arch/arm64/include/asm/asm-extable.h | 6 +++---
arch/arm64/include/asm/assembler.h | 2 +-
arch/arm64/include/asm/barrier.h | 4 ++--
arch/arm64/include/asm/cache.h | 4 ++--
arch/arm64/include/asm/cpucaps.h | 4 ++--
arch/arm64/include/asm/cpufeature.h | 4 ++--
arch/arm64/include/asm/cputype.h | 4 ++--
arch/arm64/include/asm/current.h | 4 ++--
arch/arm64/include/asm/debug-monitors.h | 4 ++--
arch/arm64/include/asm/el2_setup.h | 2 +-
arch/arm64/include/asm/elf.h | 4 ++--
arch/arm64/include/asm/esr.h | 4 ++--
arch/arm64/include/asm/fixmap.h | 4 ++--
arch/arm64/include/asm/fpsimd.h | 2 +-
arch/arm64/include/asm/ftrace.h | 6 +++---
arch/arm64/include/asm/gpr-num.h | 6 +++---
arch/arm64/include/asm/hwcap.h | 2 +-
arch/arm64/include/asm/image.h | 4 ++--
arch/arm64/include/asm/insn.h | 4 ++--
arch/arm64/include/asm/jump_label.h | 4 ++--
arch/arm64/include/asm/kasan.h | 2 +-
arch/arm64/include/asm/kexec.h | 4 ++--
arch/arm64/include/asm/kgdb.h | 4 ++--
arch/arm64/include/asm/kvm_asm.h | 4 ++--
arch/arm64/include/asm/kvm_mmu.h | 4 ++--
arch/arm64/include/asm/kvm_mte.h | 4 ++--
arch/arm64/include/asm/kvm_ptrauth.h | 6 +++---
arch/arm64/include/asm/linkage.h | 2 +-
arch/arm64/include/asm/memory.h | 4 ++--
arch/arm64/include/asm/mmu.h | 4 ++--
arch/arm64/include/asm/mmu_context.h | 4 ++--
arch/arm64/include/asm/mte-kasan.h | 4 ++--
arch/arm64/include/asm/mte.h | 4 ++--
arch/arm64/include/asm/page.h | 4 ++--
arch/arm64/include/asm/pgtable-prot.h | 4 ++--
arch/arm64/include/asm/pgtable.h | 4 ++--
arch/arm64/include/asm/proc-fns.h | 4 ++--
arch/arm64/include/asm/processor.h | 4 ++--
arch/arm64/include/asm/ptrace.h | 4 ++--
arch/arm64/include/asm/rsi_smc.h | 4 ++--
arch/arm64/include/asm/rwonce.h | 4 ++--
arch/arm64/include/asm/scs.h | 4 ++--
arch/arm64/include/asm/sdei.h | 4 ++--
arch/arm64/include/asm/smp.h | 4 ++--
arch/arm64/include/asm/spectre.h | 4 ++--
arch/arm64/include/asm/stacktrace/frame.h | 4 ++--
arch/arm64/include/asm/sysreg.h | 10 +++++-----
arch/arm64/include/asm/system_misc.h | 4 ++--
arch/arm64/include/asm/thread_info.h | 2 +-
arch/arm64/include/asm/tlbflush.h | 2 +-
arch/arm64/include/asm/vdso.h | 4 ++--
arch/arm64/include/asm/vdso/compat_barrier.h | 4 ++--
arch/arm64/include/asm/vdso/compat_gettimeofday.h | 4 ++--
arch/arm64/include/asm/vdso/getrandom.h | 4 ++--
arch/arm64/include/asm/vdso/gettimeofday.h | 4 ++--
arch/arm64/include/asm/vdso/processor.h | 4 ++--
arch/arm64/include/asm/vdso/vsyscall.h | 4 ++--
arch/arm64/include/asm/virt.h | 4 ++--
arch/arm64/include/uapi/asm/kvm.h | 2 +-
arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
tools/arch/arm64/include/asm/cputype.h | 4 ++--
tools/arch/arm64/include/asm/esr.h | 4 ++--
tools/arch/arm64/include/asm/gpr-num.h | 6 +++---
tools/arch/arm64/include/asm/sysreg.h | 10 +++++-----
tools/arch/arm64/include/uapi/asm/kvm.h | 2 +-
69 files changed, 141 insertions(+), 141 deletions(-)
--
2.51.0
next reply other threads:[~2025-10-10 13:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-10 13:01 Thomas Huth [this message]
2025-10-10 13:01 ` [PATCH v2 1/2] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
2025-10-10 13:01 ` [PATCH v2 2/2] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
2025-11-11 20:16 ` [PATCH v2 0/2] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in headers Catalin Marinas
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=20251010130116.828465-1-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=will@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;
as well as URLs for NNTP newsgroup(s).