From: Thomas Huth <thuth@redhat.com>
To: Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>,
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: linux-sh@vger.kernel.org
Subject: Re: [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers
Date: Fri, 6 Jun 2025 09:18:22 +0200 [thread overview]
Message-ID: <4a3c60ec-67c5-4682-b88c-a181a91bfd2c@redhat.com> (raw)
In-Reply-To: <20250314071013.1575167-33-thuth@redhat.com>
On 14/03/2025 08.10, 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: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
> Cc: linux-sh@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/sh/include/asm/cache.h | 4 ++--
> arch/sh/include/asm/dwarf.h | 6 +++---
> arch/sh/include/asm/fpu.h | 4 ++--
> arch/sh/include/asm/ftrace.h | 8 ++++----
> arch/sh/include/asm/mmu.h | 4 ++--
> arch/sh/include/asm/page.h | 8 ++++----
> arch/sh/include/asm/pgtable.h | 4 ++--
> arch/sh/include/asm/pgtable_32.h | 8 ++++----
> arch/sh/include/asm/processor.h | 4 ++--
> arch/sh/include/asm/smc37c93x.h | 4 ++--
> arch/sh/include/asm/suspend.h | 2 +-
> arch/sh/include/asm/thread_info.h | 10 +++++-----
> arch/sh/include/asm/tlb.h | 4 ++--
> arch/sh/include/asm/types.h | 4 ++--
> arch/sh/include/mach-common/mach/romimage.h | 6 +++---
> arch/sh/include/mach-ecovec24/mach/romimage.h | 6 +++---
> arch/sh/include/mach-kfr2r09/mach/romimage.h | 6 +++---
> 17 files changed, 46 insertions(+), 46 deletions(-)
>
> diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
> index b38dbc9755811..e7ac9c9502751 100644
> --- a/arch/sh/include/asm/cache.h
> +++ b/arch/sh/include/asm/cache.h
> @@ -22,7 +22,7 @@
>
> #define __read_mostly __section(".data..read_mostly")
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct cache_info {
> unsigned int ways; /* Number of cache ways */
> unsigned int sets; /* Number of cache sets */
> @@ -48,5 +48,5 @@ struct cache_info {
>
> unsigned long flags;
> };
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __ASM_SH_CACHE_H */
> diff --git a/arch/sh/include/asm/dwarf.h b/arch/sh/include/asm/dwarf.h
> index 5719544741221..f46d18b84833f 100644
> --- a/arch/sh/include/asm/dwarf.h
> +++ b/arch/sh/include/asm/dwarf.h
> @@ -189,7 +189,7 @@
> */
> #define DWARF_ARCH_RA_REG 17
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/compiler.h>
> #include <linux/bug.h>
> @@ -379,7 +379,7 @@ extern int module_dwarf_finalize(const Elf_Ehdr *, const Elf_Shdr *,
> struct module *);
> extern void module_dwarf_cleanup(struct module *);
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #define CFI_STARTPROC .cfi_startproc
> #define CFI_ENDPROC .cfi_endproc
> @@ -402,7 +402,7 @@ extern void module_dwarf_cleanup(struct module *);
> #define CFI_REL_OFFSET CFI_IGNORE
> #define CFI_UNDEFINED CFI_IGNORE
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> static inline void dwarf_unwinder_init(void)
> {
> }
> diff --git a/arch/sh/include/asm/fpu.h b/arch/sh/include/asm/fpu.h
> index 0379f4cce5ed2..a086e38b70eef 100644
> --- a/arch/sh/include/asm/fpu.h
> +++ b/arch/sh/include/asm/fpu.h
> @@ -2,7 +2,7 @@
> #ifndef __ASM_SH_FPU_H
> #define __ASM_SH_FPU_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
>
> @@ -67,6 +67,6 @@ static inline void clear_fpu(struct task_struct *tsk, struct pt_regs *regs)
> void float_raise(unsigned int flags);
> int float_rounding_mode(void);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* __ASM_SH_FPU_H */
> diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h
> index 1c10e10663909..d35781ab716ef 100644
> --- a/arch/sh/include/asm/ftrace.h
> +++ b/arch/sh/include/asm/ftrace.h
> @@ -7,7 +7,7 @@
> #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
> #define FTRACE_SYSCALL_MAX NR_syscalls
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern void mcount(void);
>
> #define MCOUNT_ADDR ((unsigned long)(mcount))
> @@ -35,10 +35,10 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
>
> void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* CONFIG_FUNCTION_TRACER */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* arch/sh/kernel/return_address.c */
> extern void *return_address(unsigned int);
> @@ -53,6 +53,6 @@ static inline void arch_ftrace_nmi_enter(void) { }
> static inline void arch_ftrace_nmi_exit(void) { }
> #endif
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* __ASM_SH_FTRACE_H */
> diff --git a/arch/sh/include/asm/mmu.h b/arch/sh/include/asm/mmu.h
> index 172e329fd92d0..b9c9f91e66165 100644
> --- a/arch/sh/include/asm/mmu.h
> +++ b/arch/sh/include/asm/mmu.h
> @@ -33,7 +33,7 @@
>
> #define PMB_NO_ENTRY (-1)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/errno.h>
> #include <linux/threads.h>
> #include <asm/page.h>
> @@ -102,6 +102,6 @@ pmb_remap(phys_addr_t phys, unsigned long size, pgprot_t prot)
> return pmb_remap_caller(phys, size, prot, __builtin_return_address(0));
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* __MMU_H */
> diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
> index 3990cbd9aa044..def4205491ec9 100644
> --- a/arch/sh/include/asm/page.h
> +++ b/arch/sh/include/asm/page.h
> @@ -30,7 +30,7 @@
> #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT-PAGE_SHIFT)
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/uncached.h>
>
> extern unsigned long shm_align_mask;
> @@ -85,7 +85,7 @@ typedef struct page *pgtable_t;
>
> #define pte_pgprot(x) __pgprot(pte_val(x) & PTE_FLAGS_MASK)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> /*
> * __MEMORY_START and SIZE are the physical addresses and size of RAM.
> @@ -126,10 +126,10 @@ typedef struct page *pgtable_t;
> #define ___va(x) ((x)+PAGE_OFFSET)
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define __pa(x) ___pa((unsigned long)x)
> #define __va(x) (void *)___va((unsigned long)x)
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #ifdef CONFIG_UNCACHED_MAPPING
> #if defined(CONFIG_29BIT)
> diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h
> index 729f5c6225fbb..10fa8f2bb8d1f 100644
> --- a/arch/sh/include/asm/pgtable.h
> +++ b/arch/sh/include/asm/pgtable.h
> @@ -17,7 +17,7 @@
> #include <asm/page.h>
> #include <asm/mmu.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/addrspace.h>
> #include <asm/fixmap.h>
>
> @@ -28,7 +28,7 @@
> extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
> #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> /*
> * Effective and physical address definitions, to aid with sign
> diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtable_32.h
> index f939f1215232c..bb9f9a2fc85c0 100644
> --- a/arch/sh/include/asm/pgtable_32.h
> +++ b/arch/sh/include/asm/pgtable_32.h
> @@ -170,7 +170,7 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
> (PTE_MASK | _PAGE_ACCESSED | _PAGE_CACHABLE | \
> _PAGE_DIRTY | _PAGE_SPECIAL)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #if defined(CONFIG_X2TLB) /* SH-X2 TLB */
> #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_CACHABLE | \
> @@ -287,9 +287,9 @@ static inline unsigned long copy_ptea_attributes(unsigned long x)
> __pgprot(0)
> #endif
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * Certain architectures need to do special things when PTEs
> @@ -486,5 +486,5 @@ static inline int pte_swp_exclusive(pte_t pte)
> PTE_BIT_FUNC(low, swp_mkexclusive, |= _PAGE_SWP_EXCLUSIVE);
> PTE_BIT_FUNC(low, swp_clear_exclusive, &= ~_PAGE_SWP_EXCLUSIVE);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __ASM_SH_PGTABLE_32_H */
> diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
> index 73fba7c922f92..2a0b5713ab80e 100644
> --- a/arch/sh/include/asm/processor.h
> +++ b/arch/sh/include/asm/processor.h
> @@ -5,7 +5,7 @@
> #include <asm/cpu-features.h>
> #include <asm/cache.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * CPU type and hardware bug flags. Kept separately for each CPU.
> *
> @@ -168,7 +168,7 @@ extern unsigned int instruction_size(unsigned int insn);
>
> void select_idle_routine(void);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #include <asm/processor_32.h>
>
> diff --git a/arch/sh/include/asm/smc37c93x.h b/arch/sh/include/asm/smc37c93x.h
> index 891f2f8f2fd03..caf4cd8dd2411 100644
> --- a/arch/sh/include/asm/smc37c93x.h
> +++ b/arch/sh/include/asm/smc37c93x.h
> @@ -67,7 +67,7 @@
> #define UART_DLL 0x0 /* Divisor Latch (LS) */
> #define UART_DLM 0x2 /* Divisor Latch (MS) */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> typedef struct uart_reg {
> volatile __u16 rbr;
> volatile __u16 ier;
> @@ -78,7 +78,7 @@ typedef struct uart_reg {
> volatile __u16 msr;
> volatile __u16 scr;
> } uart_reg;
> -#endif /* ! __ASSEMBLY__ */
> +#endif /* ! __ASSEMBLER__ */
>
> /* Alias for Write Only Register */
>
> diff --git a/arch/sh/include/asm/suspend.h b/arch/sh/include/asm/suspend.h
> index 47db17520261e..0f991babc5597 100644
> --- a/arch/sh/include/asm/suspend.h
> +++ b/arch/sh/include/asm/suspend.h
> @@ -2,7 +2,7 @@
> #ifndef _ASM_SH_SUSPEND_H
> #define _ASM_SH_SUSPEND_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/notifier.h>
>
> #include <asm/ptrace.h>
> diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h
> index 9f19a682d315f..471db51730361 100644
> --- a/arch/sh/include/asm/thread_info.h
> +++ b/arch/sh/include/asm/thread_info.h
> @@ -21,7 +21,7 @@
> #define FAULT_CODE_PROT (1 << 3) /* protection fault */
> #define FAULT_CODE_USER (1 << 4) /* user-mode access */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/processor.h>
>
> struct thread_info {
> @@ -49,7 +49,7 @@ struct thread_info {
> /*
> * macros/functions for gaining access to the thread information structure
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define INIT_THREAD_INFO(tsk) \
> { \
> .task = &tsk, \
> @@ -86,7 +86,7 @@ static inline struct thread_info *current_thread_info(void)
>
> extern void init_thread_xstate(void);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * Thread information flags
> @@ -144,7 +144,7 @@ extern void init_thread_xstate(void);
> */
> #define TS_USEDFPU 0x0002 /* FPU used by this task this quantum */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define TI_FLAG_FAULT_CODE_SHIFT 24
>
> @@ -164,5 +164,5 @@ static inline unsigned int get_thread_fault_code(void)
> return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT;
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
> #endif /* __ASM_SH_THREAD_INFO_H */
> diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h
> index ddf324bfb9a09..39df40d0ebc29 100644
> --- a/arch/sh/include/asm/tlb.h
> +++ b/arch/sh/include/asm/tlb.h
> @@ -2,7 +2,7 @@
> #ifndef __ASM_SH_TLB_H
> #define __ASM_SH_TLB_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/pagemap.h>
> #include <asm-generic/tlb.h>
>
> @@ -29,5 +29,5 @@ asmlinkage int handle_tlbmiss(struct pt_regs *regs, unsigned long error_code,
> unsigned long address);
>
> #endif /* CONFIG_MMU */
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __ASM_SH_TLB_H */
> diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h
> index 9b3fc923ee287..fec3e89df0b10 100644
> --- a/arch/sh/include/asm/types.h
> +++ b/arch/sh/include/asm/types.h
> @@ -7,10 +7,10 @@
> /*
> * These aren't exported outside the kernel to avoid name space clashes
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> typedef u16 insn_size_t;
> typedef u32 reg_size_t;
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __ASM_SH_TYPES_H */
> diff --git a/arch/sh/include/mach-common/mach/romimage.h b/arch/sh/include/mach-common/mach/romimage.h
> index 1915714263aab..22fb47ec9b152 100644
> --- a/arch/sh/include/mach-common/mach/romimage.h
> +++ b/arch/sh/include/mach-common/mach/romimage.h
> @@ -1,12 +1,12 @@
> /* SPDX-License-Identifier: GPL-2.0 */
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> /* do nothing here by default */
>
> -#else /* __ASSEMBLY__ */
> +#else /* __ASSEMBLER__ */
>
> static inline void mmcif_update_progress(int nr)
> {
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> diff --git a/arch/sh/include/mach-ecovec24/mach/romimage.h b/arch/sh/include/mach-ecovec24/mach/romimage.h
> index 2da6ff326cbd0..f93d494736c3d 100644
> --- a/arch/sh/include/mach-ecovec24/mach/romimage.h
> +++ b/arch/sh/include/mach-ecovec24/mach/romimage.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0 */
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> /* EcoVec board specific boot code:
> * converts the "partner-jet-script.txt" script into assembly
> @@ -22,7 +22,7 @@
> 1 : .long 0xa8000000
> 2 :
>
> -#else /* __ASSEMBLY__ */
> +#else /* __ASSEMBLER__ */
>
> /* Ecovec board specific information:
> *
> @@ -45,4 +45,4 @@ static inline void mmcif_update_progress(int nr)
> __raw_writeb(1 << (nr - 1), PGDR);
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> diff --git a/arch/sh/include/mach-kfr2r09/mach/romimage.h b/arch/sh/include/mach-kfr2r09/mach/romimage.h
> index 209275872ff06..f68bb480d3784 100644
> --- a/arch/sh/include/mach-kfr2r09/mach/romimage.h
> +++ b/arch/sh/include/mach-kfr2r09/mach/romimage.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0 */
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> /* kfr2r09 board specific boot code:
> * converts the "partner-jet-script.txt" script into assembly
> @@ -22,10 +22,10 @@
> 1: .long 0xa8000000
> 2:
>
> -#else /* __ASSEMBLY__ */
> +#else /* __ASSEMBLER__ */
>
> static inline void mmcif_update_progress(int nr)
> {
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
Friendly ping!
Yoshinori, Rich, John, could you maybe pick this patch up via your sh 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
next prev parent reply other threads:[~2025-06-06 7:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250314071013.1575167-1-thuth@redhat.com>
2025-03-14 7:10 ` [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers Thomas Huth
2025-06-06 7:18 ` Thomas Huth [this message]
2025-06-06 7:37 ` John Paul Adrian Glaubitz
2025-06-07 13:11 ` John Paul Adrian Glaubitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4a3c60ec-67c5-4682-b88c-a181a91bfd2c@redhat.com \
--to=thuth@redhat.com \
--cc=dalias@libc.org \
--cc=glaubitz@physik.fu-berlin.de \
--cc=linux-sh@vger.kernel.org \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).