Re: [PATCH 17/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers

[Michal Simek]

On 3/14/25 08:09, Thomas Huth wrote:
> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> this is not really useful for uapi headers (unless the userspace
> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> gets set automatically by the compiler when compiling assembly
> code.
>
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
>
> Cc: Michal Simek <monstr@xxxxxxxxx>
> Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
> ---
>   arch/microblaze/include/uapi/asm/ptrace.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/microblaze/include/uapi/asm/ptrace.h b/arch/microblaze/include/uapi/asm/ptrace.h
> index 46dd94cb78021..8039957a1a9cd 100644
> --- a/arch/microblaze/include/uapi/asm/ptrace.h
> +++ b/arch/microblaze/include/uapi/asm/ptrace.h
> @@ -10,7 +10,7 @@
>   #ifndef _UAPI_ASM_MICROBLAZE_PTRACE_H
>   #define _UAPI_ASM_MICROBLAZE_PTRACE_H
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   typedef unsigned long microblaze_reg_t;
>   
> @@ -68,6 +68,6 @@ struct pt_regs {
>   
>   #endif /* __KERNEL */
>   
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>   
>   #endif /* _UAPI_ASM_MICROBLAZE_PTRACE_H */

Applied.
M


--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs
TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs