Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers

[Thomas Huth <thuth@redhat.com>]

On 14/03/2025 08.09, Thomas Huth wrote:
> 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 on
> the __ASSEMBLER__ macro that is provided by the compilers now.
> 
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
> 
> Cc: Guo Ren <guoren@kernel.org>
> Cc: linux-csky@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   arch/csky/abiv1/inc/abi/regdef.h    | 2 +-
>   arch/csky/abiv2/inc/abi/regdef.h    | 2 +-
>   arch/csky/include/asm/barrier.h     | 4 ++--
>   arch/csky/include/asm/cache.h       | 2 +-
>   arch/csky/include/asm/ftrace.h      | 4 ++--
>   arch/csky/include/asm/jump_label.h  | 4 ++--
>   arch/csky/include/asm/page.h        | 4 ++--
>   arch/csky/include/asm/ptrace.h      | 4 ++--
>   arch/csky/include/asm/string.h      | 2 +-
>   arch/csky/include/asm/thread_info.h | 4 ++--
>   10 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/csky/abiv1/inc/abi/regdef.h b/arch/csky/abiv1/inc/abi/regdef.h
> index 7b386fd670702..c75ecf2cafd7c 100644
> --- a/arch/csky/abiv1/inc/abi/regdef.h
> +++ b/arch/csky/abiv1/inc/abi/regdef.h
> @@ -3,7 +3,7 @@
>   #ifndef __ASM_CSKY_REGDEF_H
>   #define __ASM_CSKY_REGDEF_H
>   
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>   #define syscallid	r1
>   #else
>   #define syscallid	"r1"
> diff --git a/arch/csky/abiv2/inc/abi/regdef.h b/arch/csky/abiv2/inc/abi/regdef.h
> index 0933addbc27b7..fc08d56ccdbe1 100644
> --- a/arch/csky/abiv2/inc/abi/regdef.h
> +++ b/arch/csky/abiv2/inc/abi/regdef.h
> @@ -3,7 +3,7 @@
>   #ifndef __ASM_CSKY_REGDEF_H
>   #define __ASM_CSKY_REGDEF_H
>   
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>   #define syscallid	r7
>   #else
>   #define syscallid	"r7"
> diff --git a/arch/csky/include/asm/barrier.h b/arch/csky/include/asm/barrier.h
> index 15de58b10aece..c33fdcfe3770c 100644
> --- a/arch/csky/include/asm/barrier.h
> +++ b/arch/csky/include/asm/barrier.h
> @@ -3,7 +3,7 @@
>   #ifndef __ASM_CSKY_BARRIER_H
>   #define __ASM_CSKY_BARRIER_H
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   #define nop()	asm volatile ("nop\n":::"memory")
>   
> @@ -84,5 +84,5 @@
>   
>   #include <asm-generic/barrier.h>
>   
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>   #endif /* __ASM_CSKY_BARRIER_H */
> diff --git a/arch/csky/include/asm/cache.h b/arch/csky/include/asm/cache.h
> index 4b5c09bf1d25e..d575482e0fcec 100644
> --- a/arch/csky/include/asm/cache.h
> +++ b/arch/csky/include/asm/cache.h
> @@ -10,7 +10,7 @@
>   
>   #define ARCH_DMA_MINALIGN	L1_CACHE_BYTES
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   void dcache_wb_line(unsigned long start);
>   
> diff --git a/arch/csky/include/asm/ftrace.h b/arch/csky/include/asm/ftrace.h
> index 00f9f7647e3f3..21532f2180587 100644
> --- a/arch/csky/include/asm/ftrace.h
> +++ b/arch/csky/include/asm/ftrace.h
> @@ -11,7 +11,7 @@
>   
>   #define MCOUNT_ADDR	((unsigned long)_mcount)
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   extern void _mcount(unsigned long);
>   
> @@ -28,5 +28,5 @@ struct dyn_arch_ftrace {
>   void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
>   			   unsigned long frame_pointer);
>   
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>   #endif /* __ASM_CSKY_FTRACE_H */
> diff --git a/arch/csky/include/asm/jump_label.h b/arch/csky/include/asm/jump_label.h
> index ef2e37a10a0fe..603b0caa80249 100644
> --- a/arch/csky/include/asm/jump_label.h
> +++ b/arch/csky/include/asm/jump_label.h
> @@ -3,7 +3,7 @@
>   #ifndef __ASM_CSKY_JUMP_LABEL_H
>   #define __ASM_CSKY_JUMP_LABEL_H
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   #include <linux/types.h>
>   
> @@ -48,5 +48,5 @@ void arch_jump_label_transform_static(struct jump_entry *entry,
>   				      enum jump_label_type type);
>   #define arch_jump_label_transform_static arch_jump_label_transform_static
>   
> -#endif  /* __ASSEMBLY__ */
> +#endif  /* __ASSEMBLER__ */
>   #endif	/* __ASM_CSKY_JUMP_LABEL_H */
> diff --git a/arch/csky/include/asm/page.h b/arch/csky/include/asm/page.h
> index 4911d0892b71d..76774dbce8697 100644
> --- a/arch/csky/include/asm/page.h
> +++ b/arch/csky/include/asm/page.h
> @@ -26,7 +26,7 @@
>   
>   #define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1))
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   #include <linux/pfn.h>
>   
> @@ -84,5 +84,5 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
>   #include <asm-generic/memory_model.h>
>   #include <asm-generic/getorder.h>
>   
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>   #endif /* __ASM_CSKY_PAGE_H */
> diff --git a/arch/csky/include/asm/ptrace.h b/arch/csky/include/asm/ptrace.h
> index 0634b7895d81d..5f01839e11843 100644
> --- a/arch/csky/include/asm/ptrace.h
> +++ b/arch/csky/include/asm/ptrace.h
> @@ -8,7 +8,7 @@
>   #include <linux/types.h>
>   #include <linux/compiler.h>
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   #define PS_S	0x80000000 /* Supervisor Mode */
>   
> @@ -98,5 +98,5 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
>   
>   asmlinkage int syscall_trace_enter(struct pt_regs *regs);
>   asmlinkage void syscall_trace_exit(struct pt_regs *regs);
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>   #endif /* __ASM_CSKY_PTRACE_H */
> diff --git a/arch/csky/include/asm/string.h b/arch/csky/include/asm/string.h
> index a0d81e9d6b8f6..82e99f52b547c 100644
> --- a/arch/csky/include/asm/string.h
> +++ b/arch/csky/include/asm/string.h
> @@ -3,7 +3,7 @@
>   #ifndef _CSKY_STRING_MM_H_
>   #define _CSKY_STRING_MM_H_
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   #include <linux/types.h>
>   #include <linux/compiler.h>
>   #include <abi/string.h>
> diff --git a/arch/csky/include/asm/thread_info.h b/arch/csky/include/asm/thread_info.h
> index b5ed788f0c681..fdd4f8ad45acf 100644
> --- a/arch/csky/include/asm/thread_info.h
> +++ b/arch/csky/include/asm/thread_info.h
> @@ -3,7 +3,7 @@
>   #ifndef _ASM_CSKY_THREAD_INFO_H
>   #define _ASM_CSKY_THREAD_INFO_H
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   #include <asm/types.h>
>   #include <asm/page.h>
> @@ -51,7 +51,7 @@ static inline struct thread_info *current_thread_info(void)
>   	return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
>   }
>   
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>   
>   #define TIF_SIGPENDING		0	/* signal pending */
>   #define TIF_NOTIFY_RESUME	1       /* callback before returning to user */

Friendly ping!

Guo Ren, could you maybe pick this (and the previous patch) up via your csky 
tree? (x86 and parisc already got merge via their respective architecture 
trees, so I guess the same should happen for this patch here, too).

  Thanks,
   Thomas