x86/headers: Replace ASSEMBLY with ASSEMBLER in non-UAPI headers

2025-05-29T09:12:33Z

[ Upstream commit 24a295e4ef1ca8e97d8b7015e1887b6e83e1c8be ] 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 , and that mentioned this macro in comments with some missing underscores. Signed-off-by: Thomas Huth Signed-off-by: Ingo Molnar Cc: Brian Gerst Cc: Juergen Gross Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Link: https://lore.kernel.org/r/20250314071013.1575167-38-thuth@redhat.com Signed-off-by: Sasha Levin

x86/setup: Move internal setup_data structures into setup_data.h

2024-01-30T14:17:12Z

Move struct_efi_setup_data in order to unify duplicated definition of the data structure in a single place. Also silence clang's warnings about GNU extensions in real-mode code which might occur from the changed includes. [ bp: Massage commit message. ] Signed-off-by: Thomas Zimmermann Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20240112095000.8952-3-tzimmermann@suse.de

kernel/arch/x86/include/asm/setup_data.h, branch linux-rolling-stable

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

x86/setup: Move internal setup_data structures into setup_data.h

x86/headers: Replace ASSEMBLY with ASSEMBLER in non-UAPI headers