On Fri, Mar 14, 2025 at 08:09:54AM +0100, 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).
Hi Thomas,
I have applied this to the OpenRISC queue, as discussed on 22.
Thanks,
-Stafford
> Cc: Jonas Bonn <jo...@southpole.se>
> Cc: Stefan Kristiansson <stefan.kristians...@saunalahti.fi>
> Cc: Stafford Horne <sho...@gmail.com>
> Cc: linux-openr...@vger.kernel.org
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
> arch/openrisc/include/asm/mmu.h | 2 +-
> arch/openrisc/include/asm/page.h | 8 ++++----
> arch/openrisc/include/asm/pgtable.h | 4 ++--
> arch/openrisc/include/asm/processor.h | 4 ++--
> arch/openrisc/include/asm/ptrace.h | 4 ++--
> arch/openrisc/include/asm/setup.h | 2 +-
> arch/openrisc/include/asm/thread_info.h | 8 ++++----
> 7 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/arch/openrisc/include/asm/mmu.h b/arch/openrisc/include/asm/mmu.h
> index eb720110f3a20..e7826a681bc4a 100644
> --- a/arch/openrisc/include/asm/mmu.h
> +++ b/arch/openrisc/include/asm/mmu.h
> @@ -15,7 +15,7 @@
> #ifndef __ASM_OPENRISC_MMU_H
> #define __ASM_OPENRISC_MMU_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> typedef unsigned long mm_context_t;
> #endif
>
> diff --git a/arch/openrisc/include/asm/page.h
> b/arch/openrisc/include/asm/page.h
> index c589e96035e15..85797f94d1d74 100644
> --- a/arch/openrisc/include/asm/page.h
> +++ b/arch/openrisc/include/asm/page.h
> @@ -25,7 +25,7 @@
> */
> #include <asm/setup.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define clear_page(page) memset((page), 0, PAGE_SIZE)
> #define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
> @@ -55,10 +55,10 @@ typedef struct page *pgtable_t;
> #define __pgd(x) ((pgd_t) { (x) })
> #define __pgprot(x) ((pgprot_t) { (x) })
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET))
> #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
> @@ -73,7 +73,7 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
>
> #define virt_addr_valid(kaddr) (pfn_valid(virt_to_pfn(kaddr)))
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #include <asm-generic/memory_model.h>
> #include <asm-generic/getorder.h>
> diff --git a/arch/openrisc/include/asm/pgtable.h
> b/arch/openrisc/include/asm/pgtable.h
> index 60c6ce7ff2dcf..cd979bd28ab3b 100644
> --- a/arch/openrisc/include/asm/pgtable.h
> +++ b/arch/openrisc/include/asm/pgtable.h
> @@ -23,7 +23,7 @@
>
> #include <asm-generic/pgtable-nopmd.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/mmu.h>
> #include <asm/fixmap.h>
>
> @@ -432,5 +432,5 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
>
> typedef pte_t *pte_addr_t;
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __ASM_OPENRISC_PGTABLE_H */
> diff --git a/arch/openrisc/include/asm/processor.h
> b/arch/openrisc/include/asm/processor.h
> index e05d1b59e24e1..3ff893a67c13b 100644
> --- a/arch/openrisc/include/asm/processor.h
> +++ b/arch/openrisc/include/asm/processor.h
> @@ -39,7 +39,7 @@
> */
> #define TASK_UNMAPPED_BASE (TASK_SIZE / 8 * 3)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct task_struct;
>
> @@ -78,5 +78,5 @@ void show_registers(struct pt_regs *regs);
>
> #define cpu_relax() barrier()
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __ASM_OPENRISC_PROCESSOR_H */
> diff --git a/arch/openrisc/include/asm/ptrace.h
> b/arch/openrisc/include/asm/ptrace.h
> index e5a282b670757..28facf2f3e00c 100644
> --- a/arch/openrisc/include/asm/ptrace.h
> +++ b/arch/openrisc/include/asm/ptrace.h
> @@ -27,7 +27,7 @@
> * they share a cacheline (not done yet, though... future optimization).
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * This struct describes how the registers are laid out on the kernel stack
> * during a syscall or other kernel entry.
> @@ -147,7 +147,7 @@ static inline unsigned long regs_get_register(struct
> pt_regs *regs,
> return *(unsigned long *)((unsigned long)regs + offset);
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * Offsets used by 'ptrace' system call interface.
> diff --git a/arch/openrisc/include/asm/setup.h
> b/arch/openrisc/include/asm/setup.h
> index 9acbc5deda691..dce9f4d3b378f 100644
> --- a/arch/openrisc/include/asm/setup.h
> +++ b/arch/openrisc/include/asm/setup.h
> @@ -8,7 +8,7 @@
> #include <linux/init.h>
> #include <asm-generic/setup.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void __init or1k_early_setup(void *fdt);
> #endif
>
> diff --git a/arch/openrisc/include/asm/thread_info.h
> b/arch/openrisc/include/asm/thread_info.h
> index 4af3049c34c21..e338fff7efb0e 100644
> --- a/arch/openrisc/include/asm/thread_info.h
> +++ b/arch/openrisc/include/asm/thread_info.h
> @@ -17,7 +17,7 @@
>
> #ifdef __KERNEL__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/types.h>
> #include <asm/processor.h>
> #endif
> @@ -38,7 +38,7 @@
> * - if the contents of this structure are changed, the assembly constants
> * must also be changed
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct thread_info {
> struct task_struct *task; /* main task structure */
> @@ -58,7 +58,7 @@ struct thread_info {
> *
> * preempt_count needs to be 1 initially, until the scheduler is functional.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define INIT_THREAD_INFO(tsk) \
> { \
> .task = &tsk, \
> @@ -75,7 +75,7 @@ register struct thread_info *current_thread_info_reg
> asm("r10");
> #define get_thread_info(ti) get_task_struct((ti)->task)
> #define put_thread_info(ti) put_task_struct((ti)->task)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> /*
> * thread information flags
> --
> 2.48.1
>
