linux-kernel - Re: [PATCH v4 1/9] alpha: Replace __ASSEMBLY__ with __ASSEMBLER_

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CA+=Fv5SPuYyZ2ASzz3oVMCRQNP-G+0pbW58o32ryXrm_RBfqSA@mail.gmail.com>
Date: Sun, 30 Nov 2025 00:00:33 +0100
From: Magnus Lindholm <linmag7@...il.com>
To: Thomas Huth <thuth@...hat.com>
Cc: Arnd Bergmann <arnd@...db.de>, linux-arch@...r.kernel.org, linux-kernel@...r.kernel.org, 
	linux-arm-kernel@...ts.infradead.org, linux-kbuild@...r.kernel.org, 
	Richard Henderson <richard.henderson@...aro.org>, Matt Turner <mattst88@...il.com>, 
	linux-alpha@...r.kernel.org
Subject: Re: [PATCH v4 1/9] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in
 the alpha headers

On Fri, Nov 21, 2025 at 11:10 AM Thomas Huth <thuth@...hat.com> wrote:
>
> From: Thomas Huth <thuth@...hat.com>
>
> 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 now
> on the __ASSEMBLER__ macro that is provided by the compilers.
>
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
>
> Cc: Richard Henderson <richard.henderson@...aro.org>
> Cc: Matt Turner <mattst88@...il.com>
> Cc: linux-alpha@...r.kernel.org
> Signed-off-by: Thomas Huth <thuth@...hat.com>
> ---
>  arch/alpha/include/asm/console.h     | 4 ++--
>  arch/alpha/include/asm/page.h        | 4 ++--
>  arch/alpha/include/asm/pal.h         | 4 ++--
>  arch/alpha/include/asm/thread_info.h | 8 ++++----
>  4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/alpha/include/asm/console.h b/arch/alpha/include/asm/console.h
> index 088b7b9eb15ae..1cabdb6064bbe 100644
> --- a/arch/alpha/include/asm/console.h
> +++ b/arch/alpha/include/asm/console.h
> @@ -4,7 +4,7 @@
>
>  #include <uapi/asm/console.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  extern long callback_puts(long unit, const char *s, long length);
>  extern long callback_getc(long unit);
>  extern long callback_open_console(void);
> @@ -26,5 +26,5 @@ struct crb_struct;
>  struct hwrpb_struct;
>  extern int callback_init_done;
>  extern void * callback_init(void *);
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>  #endif /* __AXP_CONSOLE_H */
> diff --git a/arch/alpha/include/asm/page.h b/arch/alpha/include/asm/page.h
> index 5ec4c77e432e0..d2c6667d73e9e 100644
> --- a/arch/alpha/include/asm/page.h
> +++ b/arch/alpha/include/asm/page.h
> @@ -6,7 +6,7 @@
>  #include <asm/pal.h>
>  #include <vdso/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
>  #define STRICT_MM_TYPECHECKS
>
> @@ -74,7 +74,7 @@ typedef struct page *pgtable_t;
>  #define PAGE_OFFSET            0xfffffc0000000000
>  #endif
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
>  #define __pa(x)                        ((unsigned long) (x) - PAGE_OFFSET)
>  #define __va(x)                        ((void *)((unsigned long) (x) + PAGE_OFFSET))
> diff --git a/arch/alpha/include/asm/pal.h b/arch/alpha/include/asm/pal.h
> index db2b3b18b34c7..799a64c051984 100644
> --- a/arch/alpha/include/asm/pal.h
> +++ b/arch/alpha/include/asm/pal.h
> @@ -4,7 +4,7 @@
>
>  #include <uapi/asm/pal.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
>  extern void halt(void) __attribute__((noreturn));
>  #define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
> @@ -183,5 +183,5 @@ qemu_get_vmtime(void)
>         return v0;
>  }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>  #endif /* __ALPHA_PAL_H */
> diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
> index 4a4d00b37986e..98ccbca64984c 100644
> --- a/arch/alpha/include/asm/thread_info.h
> +++ b/arch/alpha/include/asm/thread_info.h
> @@ -4,14 +4,14 @@
>
>  #ifdef __KERNEL__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  #include <asm/processor.h>
>  #include <asm/types.h>
>  #include <asm/hwrpb.h>
>  #include <asm/sysinfo.h>
>  #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  struct thread_info {
>         struct pcb_struct       pcb;            /* palcode state */
>
> @@ -44,7 +44,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
>
>  register unsigned long *current_stack_pointer __asm__ ("$30");
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
>  /* Thread information allocation.  */
>  #define THREAD_SIZE_ORDER 1
> @@ -110,7 +110,7 @@ register unsigned long *current_stack_pointer __asm__ ("$30");
>         put_user(res, (int __user *)(value));                           \
>         })
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>  extern void __save_fpu(void);
>
>  static inline void save_fpu(void)
> --
> 2.51.1
>

Reviewed-by: Magnus Lindholm <linmag7@...il.com>