loongarch: Replace __ASSEMBLY__ with __ASSEMBLER__ in the loongarch headers
Subsystems (5)
PATCH v2 1/1 loongarch: Replace __ASSEMBLY__ with __ASSEMBLER__ in the loongarch headers
From: Thomas Huth <[email protected]>
While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembler code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This is bad since macros starting with two underscores are names that are reserved by the C language. It can also be very confusing for the developers when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's now standardize on the __ASSEMBLER__ macro that is provided by the compilers.
This is almost a completely mechanical patch (done with a simple "sed -i" statement), with one comment tweaked manually in arch/loongarch/include/asm/cpu.h (it was missing the trailing underscores).
---
v2: Rebased and fixed more occurances that have been added recently
arch/loongarch/include/asm/addrspace.h | 8 ++++---- arch/loongarch/include/asm/alternative-asm.h | 4 ++-- arch/loongarch/include/asm/alternative.h | 4 ++-- arch/loongarch/include/asm/asm-extable.h | 6 +++--- arch/loongarch/include/asm/asm.h | 8 ++++---- arch/loongarch/include/asm/cpu.h | 4 ++-- arch/loongarch/include/asm/ftrace.h | 4 ++-- arch/loongarch/include/asm/gpr-num.h | 6 +++--- arch/loongarch/include/asm/irqflags.h | 4 ++-- arch/loongarch/include/asm/jump_label.h | 4 ++-- arch/loongarch/include/asm/kasan.h | 2 +- arch/loongarch/include/asm/loongarch.h | 16 ++++++++-------- arch/loongarch/include/asm/orc_types.h | 4 ++-- arch/loongarch/include/asm/page.h | 4 ++-- arch/loongarch/include/asm/pgtable-bits.h | 4 ++-- arch/loongarch/include/asm/pgtable.h | 4 ++-- arch/loongarch/include/asm/prefetch.h | 2 +- arch/loongarch/include/asm/thread_info.h | 4 ++-- arch/loongarch/include/asm/types.h | 2 +- arch/loongarch/include/asm/unwind_hints.h | 6 +++--- arch/loongarch/include/asm/vdso/arch_data.h | 4 ++-- arch/loongarch/include/asm/vdso/getrandom.h | 4 ++-- arch/loongarch/include/asm/vdso/gettimeofday.h | 4 ++-- arch/loongarch/include/asm/vdso/processor.h | 4 ++-- arch/loongarch/include/asm/vdso/vdso.h | 4 ++-- arch/loongarch/include/asm/vdso/vsyscall.h | 4 ++-- tools/arch/loongarch/include/asm/orc_types.h | 4 ++-- 27 files changed, 64 insertions(+), 64 deletions(-)
arch/loongarch/include/asm/addrspace.h +4 -4
@@ -18,12 +18,12 @@/* * This gives the physical RAM offset. */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef PHYS_OFFSET #define PHYS_OFFSET _UL(0)#endif extern unsigned long vm_map_base; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #ifndef IO_BASE #define IO_BASE CSR_DMW0_BASE
@@ -66,7 +66,7 @@ extern unsigned long vm_map_base;#define FIXADDR_TOP ((unsigned long)(long)(int)0xfffe0000)#endif -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define _ATYPE_#define _ATYPE32_#define _ATYPE64_
@@ -85,7 +85,7 @@ extern unsigned long vm_map_base;/* * 32/64-bit LoongArch address spaces */ -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define _ACAST32_#define _ACAST64_#else
arch/loongarch/include/asm/alternative-asm.h +2 -2
@@ -2,7 +2,7 @@#ifndef _ASM_ALTERNATIVE_ASM_H#define _ASM_ALTERNATIVE_ASM_H -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#include <asm/asm.h>
@@ -77,6 +77,6 @@ .previous .endm -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ASM_ALTERNATIVE_ASM_H */
arch/loongarch/include/asm/alternative.h +2 -2
@@ -2,7 +2,7 @@#ifndef _ASM_ALTERNATIVE_H#define _ASM_ALTERNATIVE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h> #include <linux/stddef.h>
@@ -106,6 +106,6 @@ extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);#define alternative_2 (oldinstr, newinstr1, feature1, newinstr2, feature2) \ (asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory")) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ASM_ALTERNATIVE_H */
arch/loongarch/include/asm/asm-extable.h +3 -3
@@ -7,7 +7,7 @@#define EX_TYPE_UACCESS_ERR_ZERO 2#define EX_TYPE_BPF 3 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define __ASM_EXTABLE_RAW (insn, fixup, type, data) \ .pushsection __ex_table, "a"; \
@@ -22,7 +22,7 @@ __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0) .endm -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ #include <linux/bits.h> #include <linux/stringify.h>
@@ -60,6 +60,6 @@#define _ASM_EXTABLE_UACCESS_ERR (insn, fixup, err) \ _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_ASM_EXTABLE_H */
arch/loongarch/include/asm/asm.h +4 -4
@@ -110,7 +110,7 @@#define LONG_SRA srai.w#define LONG_SRAV sra.w -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define LONG .word#endif #define LONGSIZE 4
@@ -131,7 +131,7 @@#define LONG_SRA srai.d#define LONG_SRAV sra.d -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define LONG .dword#endif #define LONGSIZE 8
@@ -158,7 +158,7 @@#define PTR_SCALESHIFT 2 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define PTR .word#endif #define PTRSIZE 4
@@ -181,7 +181,7 @@#define PTR_SCALESHIFT 3 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define PTR .dword#endif #define PTRSIZE 8
arch/loongarch/include/asm/cpu.h +2 -2
@@ -46,7 +46,7 @@#define PRID_PRODUCT_MASK 0x0fff -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__)enum cpu_type_enum { CPU_UNKNOWN,
@@ -55,7 +55,7 @@ enum cpu_type_enum {CPU_LAST }; -#endif /* !__ASSEMBLY */ +#endif /* !__ASSEMBLER__ */ /* * ISA Level encodings
arch/loongarch/include/asm/ftrace.h +2 -2
@@ -14,7 +14,7 @@#define MCOUNT_INSN_SIZE 4/* sizeof mcount call */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef CONFIG_DYNAMIC_FTRACE
@@ -84,7 +84,7 @@ __arch_ftrace_set_direct_caller(struct pt_regs *regs, unsigned long addr)#endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONFIG_FUNCTION_TRACER */
arch/loongarch/include/asm/gpr-num.h +3 -3
@@ -2,7 +2,7 @@#ifndef __ASM_GPR_NUM_H#define __ASM_GPR_NUM_H -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .equ .L__gpr_num_zero, 0 .irp num,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
@@ -25,7 +25,7 @@ .equ .L__gpr_num_$s\num, 23 + \num .endr -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ #define __DEFINE_ASM_GPR_NUMS \ " .equ .L__gpr_num_zero, 0\n" \
@@ -47,6 +47,6 @@" .equ .L__gpr_num_$s\\num, 23 + \\num\n" \ " .endr\n" \ -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_GPR_NUM_H */
arch/loongarch/include/asm/irqflags.h +2 -2
@@ -5,7 +5,7 @@#ifndef _ASM_IRQFLAGS_H#define _ASM_IRQFLAGS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/compiler.h> #include <linux/stringify.h>
@@ -80,6 +80,6 @@ static inline int arch_irqs_disabled(void)return arch_irqs_disabled_flags (arch_local_save_flags ()); } -#endif /* #ifndef __ASSEMBLY__ */ +#endif /* #ifndef __ASSEMBLER__ */ #endif /* _ASM_IRQFLAGS_H */
arch/loongarch/include/asm/jump_label.h +2 -2
@@ -7,7 +7,7 @@#ifndef __ASM_JUMP_LABEL_H#define __ASM_JUMP_LABEL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h>
@@ -50,5 +50,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const kereturn true; } -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_JUMP_LABEL_H */
arch/loongarch/include/asm/kasan.h +1 -1
@@ -2,7 +2,7 @@#ifndef __ASM_KASAN_H#define __ASM_KASAN_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/linkage.h> #include <linux/mmzone.h>
arch/loongarch/include/asm/loongarch.h +8 -8
@@ -9,15 +9,15 @@#include <linux/linkage.h> #include <linux/types.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <larchintrin.h> /* CPUCFG */ #define read_cpucfg (reg) __cpucfg(reg) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__/* LoongArch Registers */ #define REG_ZERO 0x0
@@ -53,7 +53,7 @@#define REG_S7 0x1e#define REG_S8 0x1f -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* Bit fields for CPUCFG registers */ #define LOONGARCH_CPUCFG0 0x0
@@ -171,7 +171,7 @@* SW emulation for KVM hypervirsor, see arch/loongarch/include/uapi/asm/kvm_para.h */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* CSR */ #define csr_read32 (reg) __csrrd_w(reg)
@@ -187,7 +187,7 @@#define iocsr_write32 (val, reg) __iocsrwr_w(val, reg)#define iocsr_write64 (val, reg) __iocsrwr_d(val, reg) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /* CSR register number */
@@ -1195,7 +1195,7 @@#define LOONGARCH_IOCSR_EXTIOI_ROUTE_BASE 0x1c00#define IOCSR_EXTIOI_VECTOR_NUM 256 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ static __always_inline u64 drdtime(void) {
@@ -1357,7 +1357,7 @@ __BUILD_CSR_OP(tlbidx)#define clear_csr_estat (val) \ csr_xchg32(~(val), val, LOONGARCH_CSR_ESTAT) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* Generic EntryLo bit definitions */ #define ENTRYLO_V (_ULCAST_(1) << 0)
arch/loongarch/include/asm/orc_types.h +2 -2
@@ -34,7 +34,7 @@#define ORC_TYPE_REGS 3#define ORC_TYPE_REGS_PARTIAL 4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -53,6 +53,6 @@ struct orc_entry { unsigned int type:3; unsigned int signal:1; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ORC_TYPES_H */
arch/loongarch/include/asm/page.h +2 -2
@@ -15,7 +15,7 @@#define HPAGE_MASK (~(HPAGE_SIZE - 1))#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/kernel.h> #include <linux/pfn.h>
@@ -110,6 +110,6 @@ extern int __virt_addr_valid(volatile void *kaddr);#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h> -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_PAGE_H */
arch/loongarch/include/asm/pgtable-bits.h +2 -2
@@ -92,7 +92,7 @@#define PAGE_KERNEL_WUC __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ _PAGE_GLOBAL | _PAGE_KERN | _CACHE_WUC) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL_SUC)
@@ -127,6 +127,6 @@ static inline pgprot_t pgprot_writecombine(pgprot_t _prot)return __pgprot (prot); } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_PGTABLE_BITS_H */
arch/loongarch/include/asm/pgtable.h +2 -2
@@ -55,7 +55,7 @@#define USER_PTRS_PER_PGD ((TASK_SIZE64 / PGDIR_SIZE)?(TASK_SIZE64 / PGDIR_SIZE):1) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/mm_types.h> #include <linux/mmzone.h>
@@ -618,6 +618,6 @@ static inline long pmd_protnone(pmd_t pmd)#define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_PGTABLE_H */
arch/loongarch/include/asm/prefetch.h +1 -1
@@ -8,7 +8,7 @@#define Pref_Load 0#define Pref_Store 8 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .macro __pref hint addr#ifdef CONFIG_CPU_HAS_PREFETCH
arch/loongarch/include/asm/thread_info.h +2 -2
@@ -10,7 +10,7 @@#ifdef __KERNEL__ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/processor.h>
@@ -53,7 +53,7 @@ static inline struct thread_info *current_thread_info(void) registerunsigned long current_stack_pointer __asm__("$sp" ); -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /* thread information allocation */ #define THREAD_SIZE SZ_16K
arch/loongarch/include/asm/types.h +1 -1
@@ -8,7 +8,7 @@#include <asm-generic/int-ll64.h> #include <uapi/asm/types.h> -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define _ULCAST_#define _U64CAST_#else
arch/loongarch/include/asm/unwind_hints.h +3 -3
@@ -5,7 +5,7 @@#include <linux/objtool.h> #include <asm/orc_types.h> -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .macro UNWIND_HINT_UNDEFINEDUNWIND_HINT type=UNWIND_HINT_TYPE_UNDEFINED
@@ -23,7 +23,7 @@ UNWIND_HINT sp_reg=ORC_REG_SP type=UNWIND_HINT_TYPE_CALL .endm -#else /* !__ASSEMBLY__ */ +#else /* !__ASSEMBLER__ */ #define UNWIND_HINT_SAVE \ UNWIND_HINT(UNWIND_HINT_TYPE_SAVE, 0, 0, 0)
@@ -31,6 +31,6 @@#define UNWIND_HINT_RESTORE \ UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_LOONGARCH_UNWIND_HINTS_H */
arch/loongarch/include/asm/vdso/arch_data.h +2 -2
@@ -7,7 +7,7 @@#ifndef _VDSO_ARCH_DATA_H#define _VDSO_ARCH_DATA_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/asm.h> #include <asm/vdso.h>
@@ -20,6 +20,6 @@ struct vdso_arch_data {struct vdso_pcpu_data pdata[NR_CPUS ]; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif
arch/loongarch/include/asm/vdso/getrandom.h +2 -2
@@ -5,7 +5,7 @@#ifndef __ASM_VDSO_GETRANDOM_H#define __ASM_VDSO_GETRANDOM_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/unistd.h> #include <asm/vdso/vdso.h>
@@ -28,6 +28,6 @@ static __always_inline ssize_t getrandom_syscall(void *_buffer, size_t _len, unsreturn ret; } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_GETRANDOM_H */
arch/loongarch/include/asm/vdso/gettimeofday.h +2 -2
@@ -7,7 +7,7 @@#ifndef __ASM_VDSO_GETTIMEOFDAY_H#define __ASM_VDSO_GETTIMEOFDAY_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/unistd.h> #include <asm/vdso/vdso.h>
@@ -89,6 +89,6 @@ static inline bool loongarch_vdso_hres_capable(void) }#define __arch_vdso_hres_capable loongarch_vdso_hres_capable -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */
arch/loongarch/include/asm/vdso/processor.h +2 -2
@@ -5,10 +5,10 @@#ifndef __ASM_VDSO_PROCESSOR_H#define __ASM_VDSO_PROCESSOR_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#define cpu_relax () barrier() -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_VDSO_PROCESSOR_H */
arch/loongarch/include/asm/vdso/vdso.h +2 -2
@@ -7,7 +7,7 @@#ifndef _ASM_VDSO_VDSO_H#define _ASM_VDSO_VDSO_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/asm.h> #include <asm/page.h>
@@ -16,6 +16,6 @@#define VVAR_SIZE (VDSO_NR_PAGES << PAGE_SHIFT) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif
arch/loongarch/include/asm/vdso/vsyscall.h +2 -2
@@ -2,13 +2,13 @@#ifndef __ASM_VDSO_VSYSCALL_H#define __ASM_VDSO_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <vdso/datapage.h> /* The asm-generic header needs to be included after the definitions above */ #include <asm-generic/vdso/vsyscall.h> -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_VSYSCALL_H */
tools/arch/loongarch/include/asm/orc_types.h +2 -2
@@ -34,7 +34,7 @@#define ORC_TYPE_REGS 3#define ORC_TYPE_REGS_PARTIAL 4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF
@@ -53,6 +53,6 @@ struct orc_entry { unsigned int type:3; unsigned int signal:1; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ORC_TYPES_H */
Signature · 1 line
2.49.0
Huacai Chen
maintainerHi, Thomas,
Quoted 12 lines · Thomas Huth
From: Thomas Huth <[email protected]>
While the GCC and Clang compilers already define
__ASSEMBLER__automatically when compiling assembler code,__ASSEMBLY__is a macro that only gets defined by the Makefiles in the kernel. This is bad since macros starting with two underscores are names that are reserved by the C language. It can also be very confusing for the developers when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use__ASSEMBLER__instead. So let's now standardize on the__ASSEMBLER__macro that is provided by the compilers.
Though it seems the trend is to use __ASSEMBLER__, I found there are some old commits do the opposite:
36396f3c36b04f79438f87a0fccfa76aa3de6af9 ("[MIPS]
s/__ASSEMBLER__/__ASSEMBLY__/ for clarity sake.")
fc4ac7a5f5996712d9123ae4850948c640edb315 ("x86: use __ASSEMBLY__ rather than __ASSEMBLER__")
Huacai
Quoted 691 lines
This is almost a completely mechanical patch (done with a simple "sed -i" statement), with one comment tweaked manually in
arch/loongarch/include/asm/cpu.h(it was missing the trailing underscores).Signed-off-by Thomas Huth <[email protected]>---
v2: Rebased and fixed more occurances that have been added recentlyarch/loongarch/include/asm/addrspace.h | 8 ++++---- arch/loongarch/include/asm/alternative-asm.h | 4 ++-- arch/loongarch/include/asm/alternative.h | 4 ++-- arch/loongarch/include/asm/asm-extable.h | 6 +++--- arch/loongarch/include/asm/asm.h | 8 ++++---- arch/loongarch/include/asm/cpu.h | 4 ++-- arch/loongarch/include/asm/ftrace.h | 4 ++-- arch/loongarch/include/asm/gpr-num.h | 6 +++--- arch/loongarch/include/asm/irqflags.h | 4 ++-- arch/loongarch/include/asm/jump_label.h | 4 ++-- arch/loongarch/include/asm/kasan.h | 2 +- arch/loongarch/include/asm/loongarch.h | 16 ++++++++-------- arch/loongarch/include/asm/orc_types.h | 4 ++-- arch/loongarch/include/asm/page.h | 4 ++-- arch/loongarch/include/asm/pgtable-bits.h | 4 ++-- arch/loongarch/include/asm/pgtable.h | 4 ++-- arch/loongarch/include/asm/prefetch.h | 2 +- arch/loongarch/include/asm/thread_info.h | 4 ++-- arch/loongarch/include/asm/types.h | 2 +- arch/loongarch/include/asm/unwind_hints.h | 6 +++--- arch/loongarch/include/asm/vdso/arch_data.h | 4 ++-- arch/loongarch/include/asm/vdso/getrandom.h | 4 ++-- arch/loongarch/include/asm/vdso/gettimeofday.h | 4 ++-- arch/loongarch/include/asm/vdso/processor.h | 4 ++-- arch/loongarch/include/asm/vdso/vdso.h | 4 ++-- arch/loongarch/include/asm/vdso/vsyscall.h | 4 ++-- tools/arch/loongarch/include/asm/orc_types.h | 4 ++-- 27 files changed, 64 insertions(+), 64 deletions(-)arch/loongarch/include/asm/addrspace.h +4
-4@@ -18,12 +18,12 @@/* * This gives the physical RAM offset. */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef PHYS_OFFSET #define PHYS_OFFSET _UL(0)#endif extern unsigned long vm_map_base; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #ifndef IO_BASE #define IO_BASE CSR_DMW0_BASE@@ -66,7 +66,7 @@ extern unsigned long vm_map_base;#define FIXADDR_TOP ((unsigned long)(long)(int)0xfffe0000)#endif -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define _ATYPE_#define _ATYPE32_#define _ATYPE64_@@ -85,7 +85,7 @@ extern unsigned long vm_map_base;/* * 32/64-bit LoongArch address spaces */ -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define _ACAST32_#define _ACAST64_#else arch/loongarch/include/asm/alternative-asm.h +2
-2@@ -2,7 +2,7 @@#ifndef _ASM_ALTERNATIVE_ASM_H#define _ASM_ALTERNATIVE_ASM_H -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#include <asm/asm.h> @@ -77,6 +77,6 @@ .previous .endm -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ASM_ALTERNATIVE_ASM_H */ arch/loongarch/include/asm/alternative.h +2
-2@@ -2,7 +2,7 @@#ifndef _ASM_ALTERNATIVE_H#define _ASM_ALTERNATIVE_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h> #include <linux/stddef.h> @@ -106,6 +106,6 @@ extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);#define alternative_2 (oldinstr, newinstr1, feature1, newinstr2, feature2) \ (asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2) ::: "memory")) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ASM_ALTERNATIVE_H */ arch/loongarch/include/asm/asm-extable.h +3
-3@@ -7,7 +7,7 @@#define EX_TYPE_UACCESS_ERR_ZERO 2#define EX_TYPE_BPF 3 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define __ASM_EXTABLE_RAW (insn, fixup, type, data) \ .pushsection __ex_table, "a"; \@@ -22,7 +22,7 @@ __ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0) .endm -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ #include <linux/bits.h> #include <linux/stringify.h> @@ -60,6 +60,6 @@#define _ASM_EXTABLE_UACCESS_ERR (insn, fixup, err) \ _ASM_EXTABLE_UACCESS_ERR_ZERO(insn, fixup, err, zero) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_ASM_EXTABLE_H */ arch/loongarch/include/asm/asm.h +4
-4@@ -110,7 +110,7 @@#define LONG_SRA srai.w#define LONG_SRAV sra.w -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define LONG .word#endif #define LONGSIZE 4@@ -131,7 +131,7 @@#define LONG_SRA srai.d#define LONG_SRAV sra.d -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define LONG .dword#endif #define LONGSIZE 8@@ -158,7 +158,7 @@#define PTR_SCALESHIFT 2 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define PTR .word#endif #define PTRSIZE 4@@ -181,7 +181,7 @@#define PTR_SCALESHIFT 3 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define PTR .dword#endif #define PTRSIZE 8arch/loongarch/include/asm/cpu.h +2
-2@@ -46,7 +46,7 @@#define PRID_PRODUCT_MASK 0x0fff -#if !defined(__ASSEMBLY__) +#if !defined(__ASSEMBLER__)enum cpu_type_enum { CPU_UNKNOWN,@@ -55,7 +55,7 @@ enum cpu_type_enum {CPU_LAST }; -#endif /* !__ASSEMBLY */ +#endif /* !__ASSEMBLER__ */ /* * ISA Level encodings arch/loongarch/include/asm/ftrace.h +2
-2@@ -14,7 +14,7 @@#define MCOUNT_INSN_SIZE 4/* sizeof mcount call */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#ifndef CONFIG_DYNAMIC_FTRACE @@ -84,7 +84,7 @@ __arch_ftrace_set_direct_caller(struct pt_regs *regs, unsigned long addr)#endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CONFIG_FUNCTION_TRACER */ arch/loongarch/include/asm/gpr-num.h +3
-3@@ -2,7 +2,7 @@#ifndef __ASM_GPR_NUM_H#define __ASM_GPR_NUM_H -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .equ .L__gpr_num_zero, 0 .irp num,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31@@ -25,7 +25,7 @@ .equ .L__gpr_num_$s\num, 23 + \num .endr -#else /* __ASSEMBLY__ */ +#else /* __ASSEMBLER__ */ #define __DEFINE_ASM_GPR_NUMS \ " .equ .L__gpr_num_zero, 0\n" \@@ -47,6 +47,6 @@" .equ .L__gpr_num_$s\\num, 23 + \\num\n" \ " .endr\n" \ -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_GPR_NUM_H */ arch/loongarch/include/asm/irqflags.h +2
-2@@ -5,7 +5,7 @@#ifndef _ASM_IRQFLAGS_H#define _ASM_IRQFLAGS_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/compiler.h> #include <linux/stringify.h> @@ -80,6 +80,6 @@ static inline int arch_irqs_disabled(void)return arch_irqs_disabled_flags (arch_local_save_flags ()); } -#endif /* #ifndef __ASSEMBLY__ */ +#endif /* #ifndef __ASSEMBLER__ */ #endif /* _ASM_IRQFLAGS_H */ arch/loongarch/include/asm/jump_label.h +2
-2@@ -7,7 +7,7 @@#ifndef __ASM_JUMP_LABEL_H#define __ASM_JUMP_LABEL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/types.h> @@ -50,5 +50,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const kereturn true; } -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_JUMP_LABEL_H */ arch/loongarch/include/asm/kasan.h +1
-1@@ -2,7 +2,7 @@#ifndef __ASM_KASAN_H#define __ASM_KASAN_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/linkage.h> #include <linux/mmzone.h> arch/loongarch/include/asm/loongarch.h +8
-8@@ -9,15 +9,15 @@#include <linux/linkage.h> #include <linux/types.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <larchintrin.h> /* CPUCFG */ #define read_cpucfg (reg) __cpucfg(reg) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__/* LoongArch Registers */ #define REG_ZERO 0x0@@ -53,7 +53,7 @@#define REG_S7 0x1e#define REG_S8 0x1f -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* Bit fields for CPUCFG registers */ #define LOONGARCH_CPUCFG0 0x0@@ -171,7 +171,7 @@* SW emulation for KVM hypervirsor, see arch/loongarch/include/uapi/asm/kvm_para.h */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* CSR */ #define csr_read32 (reg) __csrrd_w(reg)@@ -187,7 +187,7 @@#define iocsr_write32 (val, reg) __iocsrwr_w(val, reg)#define iocsr_write64 (val, reg) __iocsrwr_d(val, reg) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /* CSR register number */ @@ -1195,7 +1195,7 @@#define LOONGARCH_IOCSR_EXTIOI_ROUTE_BASE 0x1c00#define IOCSR_EXTIOI_VECTOR_NUM 256 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ static __always_inline u64 drdtime(void) {@@ -1357,7 +1357,7 @@ __BUILD_CSR_OP(tlbidx)#define clear_csr_estat (val) \ csr_xchg32(~(val), val, LOONGARCH_CSR_ESTAT) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* Generic EntryLo bit definitions */ #define ENTRYLO_V (_ULCAST_(1) << 0)arch/loongarch/include/asm/orc_types.h +2
-2@@ -34,7 +34,7 @@#define ORC_TYPE_REGS 3#define ORC_TYPE_REGS_PARTIAL 4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF @@ -53,6 +53,6 @@ struct orc_entry { unsigned int type:3; unsigned int signal:1; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ORC_TYPES_H */ arch/loongarch/include/asm/page.h +2
-2@@ -15,7 +15,7 @@#define HPAGE_MASK (~(HPAGE_SIZE - 1))#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/kernel.h> #include <linux/pfn.h> @@ -110,6 +110,6 @@ extern int __virt_addr_valid(volatile void *kaddr);#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h> -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_PAGE_H */ arch/loongarch/include/asm/pgtable-bits.h +2
-2@@ -92,7 +92,7 @@#define PAGE_KERNEL_WUC __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ _PAGE_GLOBAL | _PAGE_KERN | _CACHE_WUC) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL_SUC)@@ -127,6 +127,6 @@ static inline pgprot_t pgprot_writecombine(pgprot_t _prot)return __pgprot (prot); } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_PGTABLE_BITS_H */ arch/loongarch/include/asm/pgtable.h +2
-2@@ -55,7 +55,7 @@#define USER_PTRS_PER_PGD ((TASK_SIZE64 / PGDIR_SIZE)?(TASK_SIZE64 / PGDIR_SIZE):1) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <linux/mm_types.h> #include <linux/mmzone.h> @@ -618,6 +618,6 @@ static inline long pmd_protnone(pmd_t pmd)#define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_PGTABLE_H */ arch/loongarch/include/asm/prefetch.h +1
-1@@ -8,7 +8,7 @@#define Pref_Load 0#define Pref_Store 8 -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .macro __pref hint addr#ifdef CONFIG_CPU_HAS_PREFETCH arch/loongarch/include/asm/thread_info.h +2
-2@@ -10,7 +10,7 @@#ifdef __KERNEL__ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/processor.h> @@ -53,7 +53,7 @@ static inline struct thread_info *current_thread_info(void) registerunsigned long current_stack_pointer __asm__("$sp" ); -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ /* thread information allocation */ #define THREAD_SIZE SZ_16Karch/loongarch/include/asm/types.h +1
-1@@ -8,7 +8,7 @@#include <asm-generic/int-ll64.h> #include <uapi/asm/types.h> -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__#define _ULCAST_#define _U64CAST_#else arch/loongarch/include/asm/unwind_hints.h +3
-3@@ -5,7 +5,7 @@#include <linux/objtool.h> #include <asm/orc_types.h> -#ifdef __ASSEMBLY__ +#ifdef __ASSEMBLER__ .macro UNWIND_HINT_UNDEFINEDUNWIND_HINT type=UNWIND_HINT_TYPE_UNDEFINED @@ -23,7 +23,7 @@ UNWIND_HINT sp_reg=ORC_REG_SP type=UNWIND_HINT_TYPE_CALL .endm -#else /* !__ASSEMBLY__ */ +#else /* !__ASSEMBLER__ */ #define UNWIND_HINT_SAVE \ UNWIND_HINT(UNWIND_HINT_TYPE_SAVE, 0, 0, 0)@@ -31,6 +31,6 @@#define UNWIND_HINT_RESTORE \ UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0) -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* _ASM_LOONGARCH_UNWIND_HINTS_H */ arch/loongarch/include/asm/vdso/arch_data.h +2
-2@@ -7,7 +7,7 @@#ifndef _VDSO_ARCH_DATA_H#define _VDSO_ARCH_DATA_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/asm.h> #include <asm/vdso.h> @@ -20,6 +20,6 @@ struct vdso_arch_data {struct vdso_pcpu_data pdata[NR_CPUS ]; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif arch/loongarch/include/asm/vdso/getrandom.h +2
-2@@ -5,7 +5,7 @@#ifndef __ASM_VDSO_GETRANDOM_H#define __ASM_VDSO_GETRANDOM_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/unistd.h> #include <asm/vdso/vdso.h> @@ -28,6 +28,6 @@ static __always_inline ssize_t getrandom_syscall(void *_buffer, size_t _len, unsreturn ret; } -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_GETRANDOM_H */ arch/loongarch/include/asm/vdso/gettimeofday.h +2
-2@@ -7,7 +7,7 @@#ifndef __ASM_VDSO_GETTIMEOFDAY_H#define __ASM_VDSO_GETTIMEOFDAY_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/unistd.h> #include <asm/vdso/vdso.h> @@ -89,6 +89,6 @@ static inline bool loongarch_vdso_hres_capable(void) }#define __arch_vdso_hres_capable loongarch_vdso_hres_capable -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */ arch/loongarch/include/asm/vdso/processor.h +2
-2@@ -5,10 +5,10 @@#ifndef __ASM_VDSO_PROCESSOR_H#define __ASM_VDSO_PROCESSOR_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#define cpu_relax () barrier() -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* __ASM_VDSO_PROCESSOR_H */ arch/loongarch/include/asm/vdso/vdso.h +2
-2@@ -7,7 +7,7 @@#ifndef _ASM_VDSO_VDSO_H#define _ASM_VDSO_VDSO_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <asm/asm.h> #include <asm/page.h> @@ -16,6 +16,6 @@#define VVAR_SIZE (VDSO_NR_PAGES << PAGE_SHIFT) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif arch/loongarch/include/asm/vdso/vsyscall.h +2
-2@@ -2,13 +2,13 @@#ifndef __ASM_VDSO_VSYSCALL_H#define __ASM_VDSO_VSYSCALL_H -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__#include <vdso/datapage.h> /* The asm-generic header needs to be included after the definitions above */ #include <asm-generic/vdso/vsyscall.h> -#endif /* !__ASSEMBLY__ */ +#endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_VSYSCALL_H */ tools/arch/loongarch/include/asm/orc_types.h +2
-3@@ -34,7 +34,7 @@#define ORC_TYPE_REGS 3#define ORC_TYPE_REGS_PARTIAL 4 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__/* * This struct is more or less a vastly simplified version of the DWARF Call * Frame Information standard. It contains only the necessary parts of DWARF @@ -53,6 +53,6 @@ struct orc_entry { unsigned int type:3; unsigned int signal:1; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* _ORC_TYPES_H */ --2.49.0
Quoted 18 lines · Huacai Chen
Hi, Thomas,
Quoted 12 lines · Thomas Huth
From: Thomas Huth <[email protected]>
While the GCC and Clang compilers already define
__ASSEMBLER__automatically when compiling assembler code,__ASSEMBLY__is a macro that only gets defined by the Makefiles in the kernel. This is bad since macros starting with two underscores are names that are reserved by the C language. It can also be very confusing for the developers when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use__ASSEMBLER__instead. So let's now standardize on the__ASSEMBLER__macro that is provided by the compilers.Though it seems the trend is to use
__ASSEMBLER__, I found there are some old commits do the opposite:
Quoted 7 lines
36396f3c36b04f79438f87a0fccfa76aa3de6af9("[MIPS]
s/__ASSEMBLER__/__ASSEMBLY__/ for clarity sake.")
fc4ac7a5f5996712d9123ae4850948c640edb315("x86: use__ASSEMBLY__rather than__ASSEMBLER__")Huacai
Hi,
unfortunately, the commit messages of those two patches are not very helpful - one is just saying "for clarity sake" and the other one "As Ingo pointed out in a separate patch, we should be using __ASSEMBLY__" (but I failed to find that other patch where it might have been discussed). So it sounds to me like they tried to standardize on __ASSEMBLY__ just for consistency. However, that mission failed since other occurrences of __ASSEMBLER__ have been added to the kernel in the course of time. And __ASSEMBLER__ is also the better macro, indeed, since:
1) Userspace programs usually don't have __ASSEMBLY__ by default (unless it is set in the Makefile), so the uapi headers should really use __ASSEMBLER__ instead. And if we use __ASSEMBLER__ in the uapi headers, why should we still use another macro for the remaining kernel files?
2) As mentioned in the patch description already, macros starting with two underscores are names that are reserved by the C language, so it's better to avoid __ASSEMBLY__ (yeah, I know, the kernel mostly does not care, but still...)
3) Since a lot of other (userspace) projects use __ASSEMBLER__ instead of defining their own __ASSEMBLY__ macro, it's a constant source of confusion, see e.g.:
https://stackoverflow.com/questions/28924355/gcc-assembler-preprocessor-not-compatible-with-standard-headers
https://forums.raspberrypi.com/viewtopic.php?p=1652944#p1653834
https://github.com/riscv-software-src/opensbi/issues/199
https://lore.kernel.org/kvm/[email protected]/
So I think we really should standardize on __ASSEMBLER__ nowadays.
The related cleanup patches for x86, parisc, sh and arc patches already got merged via their specific architecture tree:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=24a295e4ef1ca8
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8a141be3233af7
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cccaea1d66e94b
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e2b6a188625a2b
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9cc646950eefda
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=179e949719fe81
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2cb74be378675c
So it would be great if you could take this loongarch patch also through the loongarch tree!
Thanks,
Thomas