Re: [PATCH v5 1/8] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers

On 09/04/2026 11.47, Thomas Huth wrote:
> From: Thomas Huth <[email protected]>
> 
> __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.
> 
> Cc: Russell King <[email protected]>
> Signed-off-by: Thomas Huth <[email protected]>
> ---
>   arch/arm/include/uapi/asm/ptrace.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
> index 2ef917957005c..15e6bff56b609 100644
> --- a/arch/arm/include/uapi/asm/ptrace.h
> +++ b/arch/arm/include/uapi/asm/ptrace.h
> @@ -110,7 +110,7 @@
>   #define PT_DATA_ADDR		0x10004
>   #define PT_TEXT_END_ADDR	0x10008
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   /*
>    * This struct defines the way the registers are stored on the
> @@ -149,6 +149,6 @@ struct pt_regs {
>   #define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
>   
>   
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>   
>   #endif /* _UAPI__ASM_ARM_PTRACE_H */

Ping!

Oleg, could you maybe take this patch through your ptrace tree?

  Thanks,
   Thomas