Re: [PATCH] s390/uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers

[Heiko Carstens]

On Mon, Mar 10, 2025 at 11:26:57AM +0100, 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.
> 
> Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
> ---
>  arch/s390/include/uapi/asm/ptrace.h | 5 +++--
>  arch/s390/include/uapi/asm/schid.h  | 4 ++--
>  arch/s390/include/uapi/asm/types.h  | 4 ++--
>  3 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/s390/include/uapi/asm/ptrace.h b/arch/s390/include/uapi/asm/ptrace.h
> index bb0826024bb95..ea202072f1ad5 100644
> --- a/arch/s390/include/uapi/asm/ptrace.h
> +++ b/arch/s390/include/uapi/asm/ptrace.h
> @@ -242,7 +242,8 @@
>  #define PTRACE_OLDSETOPTIONS		21
>  #define PTRACE_SYSEMU			31
>  #define PTRACE_SYSEMU_SINGLESTEP	32
> -#ifndef __ASSEMBLY__
> +
> +#ifndef __ASSEMBLER__
>  #include <linux/stddef.h>
>  #include <linux/types.h>

...

Did this cause any sorts of problems? I can see this pattern all over
the place, so why is this now a problem?

Also, wouldn't it be better to fix this with an sed statement in
scripts/headers_install.sh instead? Otherwise this is going to be a
never ending story since those things will be re-introduced all the
time.