Re: [PATCH 22/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers

From: Stafford Horne
Date: Sat Jun 07 2025 - 01:52:38 EST


On Fri, Mar 14, 2025 at 08:09:53AM +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.
>
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).

Thanks Thomas,

This makes sense to me, I see the other discussions now and it look's
like there is still some discussions going on. For now I have added
this to the OpenRISC queue, but I don't think it will get in until 6.16.

That should give a bit more time for the discussion and more time to
test for me.

-Stafford

> Cc: Jonas Bonn <jonas@xxxxxxxxxxxx>
> Cc: Stefan Kristiansson <stefan.kristiansson@xxxxxxxxxxxxx>
> Cc: Stafford Horne <shorne@xxxxxxxxx>
> Cc: linux-openrisc@xxxxxxxxxxxxxxx
> Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
> ---
> arch/openrisc/include/uapi/asm/ptrace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/openrisc/include/uapi/asm/ptrace.h b/arch/openrisc/include/uapi/asm/ptrace.h
> index a77cc9915ca8f..1f12a60d5a06c 100644
> --- a/arch/openrisc/include/uapi/asm/ptrace.h
> +++ b/arch/openrisc/include/uapi/asm/ptrace.h
> @@ -20,7 +20,7 @@
> #ifndef _UAPI__ASM_OPENRISC_PTRACE_H
> #define _UAPI__ASM_OPENRISC_PTRACE_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * This is the layout of the regset returned by the GETREGSET ptrace call
> */
> --
> 2.48.1
>