* [PATCH 01/41] uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (39 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
Documentation/dev-tools/checkuapi.rst | 2 +-
include/uapi/asm-generic/int-l64.h | 4 ++--
include/uapi/asm-generic/int-ll64.h | 4 ++--
include/uapi/asm-generic/signal-defs.h | 2 +-
include/uapi/asm-generic/signal.h | 4 ++--
include/uapi/linux/a.out.h | 4 ++--
include/uapi/linux/const.h | 4 ++--
include/uapi/linux/edd.h | 4 ++--
include/uapi/linux/hdlc/ioctl.h | 4 ++--
include/uapi/linux/sched.h | 2 +-
include/uapi/linux/types.h | 4 ++--
tools/include/uapi/linux/const.h | 4 ++--
tools/perf/trace/beauty/include/uapi/linux/sched.h | 2 +-
13 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Documentation/dev-tools/checkuapi.rst b/Documentation/dev-tools/checkuapi.rst
index 9072f21b50b0c..3c9a3a58c24da 100644
--- a/Documentation/dev-tools/checkuapi.rst
+++ b/Documentation/dev-tools/checkuapi.rst
@@ -273,7 +273,7 @@ Consider this change::
-typedef unsigned __bitwise __poll_t;
+typedef unsigned short __bitwise __poll_t;
- #endif /* __ASSEMBLY__ */
+ #endif /* __ASSEMBLER__ */
#endif /* _UAPI_LINUX_TYPES_H */
EOF
diff --git a/include/uapi/asm-generic/int-l64.h b/include/uapi/asm-generic/int-l64.h
index ed8bcd99c34d7..f840806bbe7e9 100644
--- a/include/uapi/asm-generic/int-l64.h
+++ b/include/uapi/asm-generic/int-l64.h
@@ -11,7 +11,7 @@
#include <asm/bitsperlong.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
* header files exported to user space
@@ -29,7 +29,7 @@ typedef unsigned int __u32;
typedef __signed__ long __s64;
typedef unsigned long __u64;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_GENERIC_INT_L64_H */
diff --git a/include/uapi/asm-generic/int-ll64.h b/include/uapi/asm-generic/int-ll64.h
index 1ed06964257c3..4fc3e882bcff9 100644
--- a/include/uapi/asm-generic/int-ll64.h
+++ b/include/uapi/asm-generic/int-ll64.h
@@ -11,7 +11,7 @@
#include <asm/bitsperlong.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
* header files exported to user space
@@ -34,7 +34,7 @@ typedef __signed__ long long __s64;
typedef unsigned long long __u64;
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_GENERIC_INT_LL64_H */
diff --git a/include/uapi/asm-generic/signal-defs.h b/include/uapi/asm-generic/signal-defs.h
index 7572f2f46ee89..4073143fa3dae 100644
--- a/include/uapi/asm-generic/signal-defs.h
+++ b/include/uapi/asm-generic/signal-defs.h
@@ -78,7 +78,7 @@
#define SIG_SETMASK 2 /* for setting the signal mask */
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef void __signalfn_t(int);
typedef __signalfn_t __user *__sighandler_t;
diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h
index 0eb69dc8e5722..6b089d4b2965b 100644
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
@@ -57,7 +57,7 @@
#define SIGSTKSZ 8192
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
unsigned long sig[_NSIG_WORDS];
} sigset_t;
@@ -88,6 +88,6 @@ typedef struct sigaltstack {
__kernel_size_t ss_size;
} stack_t;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI__ASM_GENERIC_SIGNAL_H */
diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
index 5fafde3798e57..cbcc37674e64c 100644
--- a/include/uapi/linux/a.out.h
+++ b/include/uapi/linux/a.out.h
@@ -10,7 +10,7 @@
#endif /* __STRUCT_EXEC_OVERRIDE__ */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* these go in the N_MACHTYPE field */
enum machine_type {
@@ -247,5 +247,5 @@ struct relocation_info
};
#endif /* no N_RELOCATION_INFO_DECLARED. */
-#endif /*__ASSEMBLY__ */
+#endif /*__ASSEMBLER__ */
#endif /* _UAPI__A_OUT_GNU_H__ */
diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h
index e16be0d37746e..8189610216211 100644
--- a/include/uapi/linux/const.h
+++ b/include/uapi/linux/const.h
@@ -13,7 +13,7 @@
* leave it unchanged in asm.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _AC(X,Y) X
#define _AT(T,X) X
#else
@@ -28,7 +28,7 @@
#define _BITUL(x) (_UL(1) << (x))
#define _BITULL(x) (_ULL(1) << (x))
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/*
* Missing asm support
*
diff --git a/include/uapi/linux/edd.h b/include/uapi/linux/edd.h
index 0fe3e02aec653..566f206964862 100644
--- a/include/uapi/linux/edd.h
+++ b/include/uapi/linux/edd.h
@@ -53,7 +53,7 @@
#define EDD_MBR_SIG_NR_BUF 0x1ea /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF
in boot_params - treat this as 1 byte */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define EDD_EXT_FIXED_DISK_ACCESS (1 << 0)
#define EDD_EXT_DEVICE_LOCKING_AND_EJECTING (1 << 1)
@@ -187,6 +187,6 @@ struct edd {
unsigned char edd_info_nr;
};
-#endif /*!__ASSEMBLY__ */
+#endif /*!__ASSEMBLER__ */
#endif /* _UAPI_LINUX_EDD_H */
diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioctl.h
index b06341acab5ec..0905383d72aa5 100644
--- a/include/uapi/linux/hdlc/ioctl.h
+++ b/include/uapi/linux/hdlc/ioctl.h
@@ -35,7 +35,7 @@
#define LMI_CCITT 3 /* ITU-T Annex A */
#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
unsigned int clock_rate; /* bits per second */
@@ -90,5 +90,5 @@ typedef struct {
/* PPP doesn't need any info now - supply length = 0 to ioctl */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __HDLC_IOCTL_H__ */
diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h
index 359a14cc76a40..30f0c11959011 100644
--- a/include/uapi/linux/sched.h
+++ b/include/uapi/linux/sched.h
@@ -43,7 +43,7 @@
*/
#define CLONE_NEWTIME 0x00000080 /* New time namespace */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* struct clone_args - arguments for the clone3 syscall
* @flags: Flags for the new process as listed above.
diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h
index 48b933938877d..00743f894e7e3 100644
--- a/include/uapi/linux/types.h
+++ b/include/uapi/linux/types.h
@@ -4,7 +4,7 @@
#include <asm/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef __KERNEL__
#ifndef __EXPORTED_HEADERS__
#warning "Attempt to use kernel headers from user space, see https://kernelnewbies.org/KernelHeaders"
@@ -59,5 +59,5 @@ typedef __u32 __bitwise __wsum;
typedef unsigned __bitwise __poll_t;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_LINUX_TYPES_H */
diff --git a/tools/include/uapi/linux/const.h b/tools/include/uapi/linux/const.h
index e16be0d37746e..8189610216211 100644
--- a/tools/include/uapi/linux/const.h
+++ b/tools/include/uapi/linux/const.h
@@ -13,7 +13,7 @@
* leave it unchanged in asm.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _AC(X,Y) X
#define _AT(T,X) X
#else
@@ -28,7 +28,7 @@
#define _BITUL(x) (_UL(1) << (x))
#define _BITULL(x) (_ULL(1) << (x))
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/*
* Missing asm support
*
diff --git a/tools/perf/trace/beauty/include/uapi/linux/sched.h b/tools/perf/trace/beauty/include/uapi/linux/sched.h
index 359a14cc76a40..30f0c11959011 100644
--- a/tools/perf/trace/beauty/include/uapi/linux/sched.h
+++ b/tools/perf/trace/beauty/include/uapi/linux/sched.h
@@ -43,7 +43,7 @@
*/
#define CLONE_NEWTIME 0x00000080 /* New time namespace */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* struct clone_args - arguments for the clone3 syscall
* @flags: Flags for the new process as listed above.
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
2025-03-14 7:09 ` [PATCH 01/41] uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 03/41] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers Thomas Huth
` (38 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth
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), except for some manual tweaking in the files
include/linux/irqchip/arm-gic.h and include/soc/tegra/flowctrl.h
(which got the macro wrong in a comment).
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/asm-generic/barrier.h | 4 ++--
include/asm-generic/bug.h | 4 ++--
include/asm-generic/current.h | 2 +-
include/asm-generic/error-injection.h | 2 +-
include/asm-generic/fixmap.h | 4 ++--
include/asm-generic/getorder.h | 4 ++--
include/asm-generic/int-ll64.h | 6 +++---
include/asm-generic/kprobes.h | 4 ++--
include/asm-generic/memory_model.h | 4 ++--
include/asm-generic/mmu.h | 2 +-
include/asm-generic/pgtable-nop4d.h | 4 ++--
include/asm-generic/pgtable-nopmd.h | 4 ++--
include/asm-generic/pgtable-nopud.h | 4 ++--
include/asm-generic/rwonce.h | 4 ++--
include/asm-generic/signal.h | 4 ++--
include/asm-generic/vdso/vsyscall.h | 4 ++--
include/linux/amba/serial.h | 4 ++--
include/linux/arm-smccc.h | 4 ++--
include/linux/bitmap.h | 4 ++--
include/linux/bits.h | 4 ++--
include/linux/cfi_types.h | 4 ++--
include/linux/compiler.h | 4 ++--
include/linux/compiler_types.h | 4 ++--
include/linux/edd.h | 4 ++--
include/linux/err.h | 2 +-
include/linux/export.h | 2 +-
include/linux/init.h | 6 +++---
include/linux/ioport.h | 4 ++--
include/linux/irqchip/arm-gic-v3.h | 2 +-
include/linux/irqchip/arm-gic.h | 4 ++--
include/linux/jump_label.h | 10 +++++-----
include/linux/kexec.h | 2 +-
include/linux/linkage.h | 6 +++---
include/linux/mem_encrypt.h | 4 ++--
include/linux/mmzone.h | 4 ++--
include/linux/objtool.h | 10 +++++-----
include/linux/objtool_types.h | 4 ++--
include/linux/of_fdt.h | 4 ++--
include/linux/pe.h | 4 ++--
include/linux/percpu-defs.h | 4 ++--
include/linux/pfn.h | 2 +-
include/linux/pgtable.h | 4 ++--
include/linux/platform_data/emif_plat.h | 4 ++--
include/linux/serial_s3c.h | 4 ++--
include/linux/ti-emif-sram.h | 2 +-
include/linux/types.h | 4 ++--
include/soc/imx/cpu.h | 2 +-
include/soc/tegra/flowctrl.h | 4 ++--
include/soc/tegra/fuse.h | 4 ++--
include/vdso/datapage.h | 4 ++--
include/vdso/helpers.h | 4 ++--
include/vdso/processor.h | 4 ++--
include/vdso/vsyscall.h | 4 ++--
include/xen/arm/interface.h | 2 +-
include/xen/interface/xen-mca.h | 4 ++--
include/xen/interface/xen.h | 8 ++++----
tools/include/asm-generic/barrier.h | 4 ++--
tools/include/asm/alternative.h | 2 +-
tools/include/linux/bits.h | 4 ++--
tools/include/linux/compiler.h | 4 ++--
tools/include/linux/objtool_types.h | 4 ++--
61 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
index d4f581c1e21da..e8038f7084a87 100644
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
@@ -11,7 +11,7 @@
#ifndef __ASM_GENERIC_BARRIER_H
#define __ASM_GENERIC_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/kcsan-checks.h>
@@ -302,5 +302,5 @@ do { \
# define smp_mb__after_switch_mm() smp_mb()
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_GENERIC_BARRIER_H */
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 387720933973b..e4577f449f066 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -17,7 +17,7 @@
#define BUG_GET_TAINT(bug) ((bug)->flags >> 8)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/panic.h>
#include <linux/printk.h>
@@ -224,6 +224,6 @@ extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
# define WARN_ON_SMP(x) ({0;})
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/include/asm-generic/current.h b/include/asm-generic/current.h
index 9c2aeecbd05a6..8e7d8f019377f 100644
--- a/include/asm-generic/current.h
+++ b/include/asm-generic/current.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GENERIC_CURRENT_H
#define __ASM_GENERIC_CURRENT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/thread_info.h>
#define get_current() (current_thread_info()->task)
diff --git a/include/asm-generic/error-injection.h b/include/asm-generic/error-injection.h
index b05253f68eaa5..0a9ec33fa8f20 100644
--- a/include/asm-generic/error-injection.h
+++ b/include/asm-generic/error-injection.h
@@ -2,7 +2,7 @@
#ifndef _ASM_GENERIC_ERROR_INJECTION_H
#define _ASM_GENERIC_ERROR_INJECTION_H
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
enum {
EI_ETYPE_NULL, /* Return NULL if failure */
EI_ETYPE_ERRNO, /* Return -ERRNO if failure */
diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h
index 29cab7947980a..3ff832ebcea50 100644
--- a/include/asm-generic/fixmap.h
+++ b/include/asm-generic/fixmap.h
@@ -21,7 +21,7 @@
#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT))
#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* 'index to address' translation. If anyone tries to use the idx
* directly without translation, we catch the bug with a NULL-deference
@@ -97,5 +97,5 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
#define set_fixmap_io(idx, phys) \
__set_fixmap(idx, phys, FIXMAP_PAGE_IO)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GENERIC_FIXMAP_H */
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index f2979e3a96b60..875ccae196832 100644
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GENERIC_GETORDER_H
#define __ASM_GENERIC_GETORDER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/log2.h>
@@ -47,6 +47,6 @@ static __always_inline __attribute_const__ int get_order(unsigned long size)
#endif
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GENERIC_GETORDER_H */
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
index a248545f1e18c..58974e8abbfae 100644
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
@@ -11,7 +11,7 @@
#include <uapi/asm-generic/int-ll64.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef __s8 s8;
typedef __u8 u8;
@@ -31,7 +31,7 @@ typedef __u64 u64;
#define S64_C(x) x ## LL
#define U64_C(x) x ## ULL
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define S8_C(x) x
#define U8_C(x) x
@@ -42,6 +42,6 @@ typedef __u64 u64;
#define S64_C(x) x
#define U64_C(x) x
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_GENERIC_INT_LL64_H */
diff --git a/include/asm-generic/kprobes.h b/include/asm-generic/kprobes.h
index 060eab094e5a2..7161a90d0aa6e 100644
--- a/include/asm-generic/kprobes.h
+++ b/include/asm-generic/kprobes.h
@@ -2,7 +2,7 @@
#ifndef _ASM_GENERIC_KPROBES_H
#define _ASM_GENERIC_KPROBES_H
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
#ifdef CONFIG_KPROBES
/*
* Blacklist ganerating macro. Specify functions which is not probed
@@ -21,6 +21,6 @@ static unsigned long __used \
# define __kprobes
# define nokprobe_inline inline
#endif
-#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
+#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */
#endif /* _ASM_GENERIC_KPROBES_H */
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index 6d1fb6162ac1a..ea3491575438b 100644
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -4,7 +4,7 @@
#include <linux/pfn.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* supports 3 memory models.
@@ -77,6 +77,6 @@ static inline int pfn_valid(unsigned long pfn)
#endif /* CONFIG_DEBUG_VIRTUAL */
#define phys_to_page(phys) pfn_to_page(PHYS_PFN(phys))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/include/asm-generic/mmu.h b/include/asm-generic/mmu.h
index 0618380375429..5f78971e3ac2c 100644
--- a/include/asm-generic/mmu.h
+++ b/include/asm-generic/mmu.h
@@ -6,7 +6,7 @@
* This is the mmu.h header for nommu implementations.
* Architectures with an MMU need something more complex.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
unsigned long end_brk;
diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h
index 03b7dae47dd43..89c21f84cffbe 100644
--- a/include/asm-generic/pgtable-nop4d.h
+++ b/include/asm-generic/pgtable-nop4d.h
@@ -2,7 +2,7 @@
#ifndef _PGTABLE_NOP4D_H
#define _PGTABLE_NOP4D_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __PAGETABLE_P4D_FOLDED 1
@@ -54,5 +54,5 @@ static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)
#undef p4d_addr_end
#define p4d_addr_end(addr, end) (end)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _PGTABLE_NOP4D_H */
diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
index 8ffd64e7a24cb..36b6490ed1808 100644
--- a/include/asm-generic/pgtable-nopmd.h
+++ b/include/asm-generic/pgtable-nopmd.h
@@ -2,7 +2,7 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/pgtable-nopud.h>
@@ -68,6 +68,6 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
#undef pmd_addr_end
#define pmd_addr_end(addr, end) (end)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _PGTABLE_NOPMD_H */
diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
index eb70c6d7ceff2..356cbfbaab247 100644
--- a/include/asm-generic/pgtable-nopud.h
+++ b/include/asm-generic/pgtable-nopud.h
@@ -2,7 +2,7 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/pgtable-nop4d.h>
@@ -62,5 +62,5 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)
#undef pud_addr_end
#define pud_addr_end(addr, end) (end)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _PGTABLE_NOPUD_H */
diff --git a/include/asm-generic/rwonce.h b/include/asm-generic/rwonce.h
index 8d0a6280e9824..e974843da4799 100644
--- a/include/asm-generic/rwonce.h
+++ b/include/asm-generic/rwonce.h
@@ -20,7 +20,7 @@
#ifndef __ASM_GENERIC_RWONCE_H
#define __ASM_GENERIC_RWONCE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler_types.h>
#include <linux/kasan-checks.h>
@@ -86,5 +86,5 @@ unsigned long read_word_at_a_time(const void *addr)
return *(unsigned long *)addr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GENERIC_RWONCE_H */
diff --git a/include/asm-generic/signal.h b/include/asm-generic/signal.h
index 663dd6d0795dc..392e59fd3d8b9 100644
--- a/include/asm-generic/signal.h
+++ b/include/asm-generic/signal.h
@@ -4,10 +4,10 @@
#include <uapi/asm-generic/signal.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/sigcontext.h>
#undef __HAVE_ARCH_SIG_BITOPS
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_GENERIC_SIGNAL_H */
diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h
index 01dafd604188f..b11e2ef0c41de 100644
--- a/include/asm-generic/vdso/vsyscall.h
+++ b/include/asm-generic/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GENERIC_VSYSCALL_H
#define __ASM_GENERIC_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef __arch_get_k_vdso_data
static __always_inline struct vdso_data *__arch_get_k_vdso_data(void)
@@ -23,6 +23,6 @@ static __always_inline void __arch_sync_vdso_data(struct vdso_data *vdata)
}
#endif /* __arch_sync_vdso_data */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_GENERIC_VSYSCALL_H */
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index 9120de05ead08..b9129c0d6304f 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -10,7 +10,7 @@
#ifndef ASM_ARM_HARDWARE_SERIAL_AMBA_H
#define ASM_ARM_HARDWARE_SERIAL_AMBA_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitfield.h>
#include <linux/bits.h>
#endif
@@ -215,7 +215,7 @@
#define UART01x_RSR_ANY (UART01x_RSR_OE | UART01x_RSR_BE | UART01x_RSR_PE | UART01x_RSR_FE)
#define UART01x_FR_MODEM_ANY (UART01x_FR_DCD | UART01x_FR_DSR | UART01x_FR_CTS)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct amba_device; /* in uncompress this is included but amba/bus.h is not */
struct amba_pl010_data {
void (*set_mctrl)(struct amba_device *dev, void __iomem *base, unsigned int mctrl);
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
index 67f6fdf2e7cd8..2037ee0b38c5c 100644
--- a/include/linux/arm-smccc.h
+++ b/include/linux/arm-smccc.h
@@ -282,7 +282,7 @@
#define SMCCC_RET_NOT_REQUIRED -2
#define SMCCC_RET_INVALID_PARAMETER -3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
#include <linux/types.h>
@@ -639,5 +639,5 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,
method; \
})
-#endif /*__ASSEMBLY__*/
+#endif /*__ASSEMBLER__*/
#endif /*__LINUX_ARM_SMCCC_H*/
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 2026953e2c4ed..6aec78be523ee 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -2,7 +2,7 @@
#ifndef __LINUX_BITMAP_H
#define __LINUX_BITMAP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/align.h>
#include <linux/bitops.h>
@@ -829,6 +829,6 @@ void bitmap_write(unsigned long *map, unsigned long value,
#define bitmap_set_value8(map, value, start) \
bitmap_write(map, value, start, BITS_PER_BYTE)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __LINUX_BITMAP_H */
diff --git a/include/linux/bits.h b/include/linux/bits.h
index 61a75d3f294bf..a441f6db6814e 100644
--- a/include/linux/bits.h
+++ b/include/linux/bits.h
@@ -18,7 +18,7 @@
* position @h. For example
* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
*/
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#include <linux/build_bug.h>
#include <linux/compiler.h>
#define GENMASK_INPUT_CHECK(h, l) BUILD_BUG_ON_ZERO(const_true((l) > (h)))
@@ -35,7 +35,7 @@
#define GENMASK_ULL(h, l) \
(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/*
* Missing asm support
*
diff --git a/include/linux/cfi_types.h b/include/linux/cfi_types.h
index 6b87136757655..7de4100cea531 100644
--- a/include/linux/cfi_types.h
+++ b/include/linux/cfi_types.h
@@ -5,7 +5,7 @@
#ifndef _LINUX_CFI_TYPES_H
#define _LINUX_CFI_TYPES_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <linux/linkage.h>
#ifdef CONFIG_CFI_CLANG
@@ -41,5 +41,5 @@
SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_CFI_TYPES_H */
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 1553857548241..59a47996b1427 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -4,7 +4,7 @@
#include <linux/compiler_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __KERNEL__
@@ -221,7 +221,7 @@ static inline void *offset_to_ptr(const int *off)
return (void *)((unsigned long)off + *off);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_64BIT
#define ARCH_SEL(a,b) a
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 981cc3d7e3aa5..77635cd464567 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -11,7 +11,7 @@
#define __has_builtin(x) (0)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Skipped when running bindgen due to a libclang issue;
@@ -388,7 +388,7 @@ struct ftrace_likely_data {
#endif /* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* The below symbols may be defined for one or more, but not ALL, of the above
diff --git a/include/linux/edd.h b/include/linux/edd.h
index 1c16fbcb81c06..32517f283f044 100644
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
@@ -23,7 +23,7 @@
#include <uapi/linux/edd.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern struct edd edd;
-#endif /*!__ASSEMBLY__ */
+#endif /*!__ASSEMBLER__ */
#endif /* _LINUX_EDD_H */
diff --git a/include/linux/err.h b/include/linux/err.h
index a4dacd745fcf4..4e822e7a86c98 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -17,7 +17,7 @@
*/
#define MAX_ERRNO 4095
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* IS_ERR_VALUE - Detect an error pointer.
diff --git a/include/linux/export.h b/include/linux/export.h
index a8c23d945634b..a812e40b7bcdd 100644
--- a/include/linux/export.h
+++ b/include/linux/export.h
@@ -45,7 +45,7 @@
#define __EXPORT_SYMBOL(sym, license, ns) __GENKSYMS_EXPORT_SYMBOL(sym)
-#elif defined(__ASSEMBLY__)
+#elif defined(__ASSEMBLER__)
#define __EXPORT_SYMBOL(sym, license, ns) \
___EXPORT_SYMBOL(sym, license, ns)
diff --git a/include/linux/init.h b/include/linux/init.h
index ee1309473bc62..b53e99b008a60 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -108,7 +108,7 @@
#define __REFDATA .section ".ref.data", "aw"
#define __REFCONST .section ".ref.rodata", "a"
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Used for initialization calls..
*/
@@ -186,7 +186,7 @@ extern struct module __this_module;
#ifndef MODULE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* initcalls are now grouped by functionality into separate
@@ -380,7 +380,7 @@ extern const struct obs_kernel_param __setup_start[], __setup_end[];
/* Relies on boot_command_line being set */
void __init parse_early_param(void);
void __init parse_early_options(char *cmdline);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* MODULE */
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 5385349f0b8a6..8ab54f4c47cec 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -9,7 +9,7 @@
#ifndef _LINUX_IOPORT_H
#define _LINUX_IOPORT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bits.h>
#include <linux/compiler.h>
#include <linux/minmax.h>
@@ -421,5 +421,5 @@ static inline void irqresource_disabled(struct resource *res, u32 irq)
extern struct address_space *iomem_get_mapping(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_IOPORT_H */
diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
index 70c0948f978eb..9628465516abc 100644
--- a/include/linux/irqchip/arm-gic-v3.h
+++ b/include/linux/irqchip/arm-gic-v3.h
@@ -603,7 +603,7 @@
#include <asm/arch_gicv3.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* We need a value to serve as a irq-type for LPIs. Choose one that will
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
index 2223f95079ce8..4c36c60791e5f 100644
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
@@ -125,7 +125,7 @@
#define GICV_PMR_PRIORITY_SHIFT 3
#define GICV_PMR_PRIORITY_MASK (0x1f << GICV_PMR_PRIORITY_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/irqdomain.h>
@@ -156,5 +156,5 @@ int gic_get_cpu_id(unsigned int cpu);
void gic_migrate_target(unsigned int new_cpu_id);
unsigned long gic_get_sgir_physaddr(void);
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index fdb79dd1ebd8c..b4bb7854963c3 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -71,7 +71,7 @@
* Additional babbling in: Documentation/staging/static-keys.rst
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -107,12 +107,12 @@ struct static_key {
#endif /* CONFIG_JUMP_LABEL */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_JUMP_LABEL
#include <asm/jump_label.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE
struct jump_entry {
@@ -187,7 +187,7 @@ static inline int jump_entry_size(struct jump_entry *entry)
#endif
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum jump_label_type {
JUMP_LABEL_NOP = 0,
@@ -538,6 +538,6 @@ extern bool ____wrong_branch_error(void);
#define static_branch_enable_cpuslocked(x) static_key_enable_cpuslocked(&(x)->key)
#define static_branch_disable_cpuslocked(x) static_key_disable_cpuslocked(&(x)->key)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_JUMP_LABEL_H */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index f0e9f8eda7a3c..5cdd8c60ab188 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -13,7 +13,7 @@
#define IND_SOURCE (1 << IND_SOURCE_BIT)
#define IND_FLAGS (IND_DESTINATION | IND_INDIRECTION | IND_DONE | IND_SOURCE)
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#include <linux/vmcore_info.h>
#include <linux/crash_reserve.h>
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 5c8865bb59d91..a0d3561b88393 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -62,7 +62,7 @@
* end up needing stack temporaries for).
*/
/* Assembly files may be compiled with -traditional .. */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef asmlinkage_protect
# define asmlinkage_protect(n, ret, args...) do { } while (0)
#endif
@@ -73,7 +73,7 @@
#define __ALIGN_STR __stringify(__ALIGN)
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* SYM_T_FUNC -- type used by assembler to mark functions */
#ifndef SYM_T_FUNC
@@ -355,6 +355,6 @@
SYM_DATA_END(name)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_LINKAGE_H */
diff --git a/include/linux/mem_encrypt.h b/include/linux/mem_encrypt.h
index ae45263892611..9fc35962366b9 100644
--- a/include/linux/mem_encrypt.h
+++ b/include/linux/mem_encrypt.h
@@ -10,7 +10,7 @@
#ifndef __MEM_ENCRYPT_H__
#define __MEM_ENCRYPT_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_ARCH_HAS_MEM_ENCRYPT
@@ -31,6 +31,6 @@
#define __sme_clr(x) (x)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __MEM_ENCRYPT_H__ */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 9540b41894da6..a135cfbd6dffa 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -2,7 +2,7 @@
#ifndef _LINUX_MMZONE_H
#define _LINUX_MMZONE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef __GENERATING_BOUNDS_H
#include <linux/spinlock.h>
@@ -2121,5 +2121,5 @@ void sparse_init(void);
#endif /* CONFIG_SPARSEMEM */
#endif /* !__GENERATING_BOUNDS.H */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _LINUX_MMZONE_H */
diff --git a/include/linux/objtool.h b/include/linux/objtool.h
index c722a921165ba..a45af87550326 100644
--- a/include/linux/objtool.h
+++ b/include/linux/objtool.h
@@ -8,7 +8,7 @@
#include <asm/asm.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define UNWIND_HINT(type, sp_reg, sp_offset, signal) \
"987: \n\t" \
@@ -63,7 +63,7 @@
"911:\n\t" \
__ASM_ANNOTATE(911b, type)
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/*
* In asm, there are two kinds of code: normal C-type callable functions and
@@ -119,11 +119,11 @@
.popsection
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* !CONFIG_OBJTOOL */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define UNWIND_HINT(type, sp_reg, sp_offset, signal) "\n\t"
#define STACK_FRAME_NON_STANDARD(func)
@@ -141,7 +141,7 @@
#endif /* CONFIG_OBJTOOL */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Annotate away the various 'relocation to !ENDBR` complaints; knowing that
* these relocations will never be used for indirect calls.
diff --git a/include/linux/objtool_types.h b/include/linux/objtool_types.h
index df5d9fa84dba3..3d7cbb4360d8e 100644
--- a/include/linux/objtool_types.h
+++ b/include/linux/objtool_types.h
@@ -2,7 +2,7 @@
#ifndef _LINUX_OBJTOOL_TYPES_H
#define _LINUX_OBJTOOL_TYPES_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -18,7 +18,7 @@ struct unwind_hint {
u8 signal;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index b8d6c0c208760..59390fcd3c852 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -16,7 +16,7 @@
/* Definitions used by the flattened device tree */
#define OF_DT_HEADER 0xd00dfeed /* marker */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if defined(CONFIG_OF_FLATTREE)
@@ -94,5 +94,5 @@ static inline void unflatten_device_tree(void) {}
static inline void unflatten_and_copy_device_tree(void) {}
#endif /* CONFIG_OF_EARLY_FLATTREE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_OF_FDT_H */
diff --git a/include/linux/pe.h b/include/linux/pe.h
index fdf9c95709ba0..60864685dd5b3 100644
--- a/include/linux/pe.h
+++ b/include/linux/pe.h
@@ -171,7 +171,7 @@
#define IMAGE_DEBUG_TYPE_CODEVIEW 2
#define IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS 20
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mz_hdr {
uint16_t magic; /* MZ_MAGIC */
@@ -477,6 +477,6 @@ struct win_certificate {
uint16_t cert_type;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __LINUX_PE_H */
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 5b520fe86b609..cddac58ab18c2 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -201,7 +201,7 @@
/*
* Accessors and operations.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* __verify_pcpu_ptr() verifies @ptr is a percpu pointer without evaluating
@@ -512,5 +512,5 @@ do { \
#define this_cpu_inc_return(pcp) this_cpu_add_return(pcp, 1)
#define this_cpu_dec_return(pcp) this_cpu_add_return(pcp, -1)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_PERCPU_DEFS_H */
diff --git a/include/linux/pfn.h b/include/linux/pfn.h
index 14bc053c53d8a..5dff19d30734c 100644
--- a/include/linux/pfn.h
+++ b/include/linux/pfn.h
@@ -2,7 +2,7 @@
#ifndef _LINUX_PFN_H_
#define _LINUX_PFN_H_
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
/*
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index 94d267d02372e..af998b2bddb1a 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -8,7 +8,7 @@
#define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT)
#define PUD_ORDER (PUD_SHIFT - PAGE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_MMU
#include <linux/mm_types.h>
@@ -1809,7 +1809,7 @@ static inline bool arch_has_pfn_modify_check(void)
/* Page-Table Modification Mask */
typedef unsigned int pgtbl_mod_mask;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#if !defined(MAX_POSSIBLE_PHYSMEM_BITS) && !defined(CONFIG_64BIT)
#ifdef CONFIG_PHYS_ADDR_T_64BIT
diff --git a/include/linux/platform_data/emif_plat.h b/include/linux/platform_data/emif_plat.h
index b93feef5d586f..ad7f706c124e3 100644
--- a/include/linux/platform_data/emif_plat.h
+++ b/include/linux/platform_data/emif_plat.h
@@ -39,7 +39,7 @@
#define EMIF_CUSTOM_CONFIG_TEMP_ALERT_POLL_INTERVAL 0x00000002
#define EMIF_CUSTOM_CONFIG_EXTENDED_TEMP_PART 0x00000004
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* struct ddr_device_info - All information about the DDR device except AC
* timing parameters
@@ -121,6 +121,6 @@ struct emif_platform_data {
u32 ip_rev;
u32 phy_type;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __LINUX_EMIF_H */
diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h
index 102aa33d956c4..f54cb6e23f85e 100644
--- a/include/linux/serial_s3c.h
+++ b/include/linux/serial_s3c.h
@@ -269,7 +269,7 @@
#define APPLE_S5L_UTRSTAT_RXTO BIT(9)
#define APPLE_S5L_UTRSTAT_ALL_FLAGS GENMASK(9, 3)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/serial_core.h>
@@ -294,7 +294,7 @@ struct s3c2410_uartcfg {
unsigned long ufcon; /* value of ufcon for port */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ARM_REGS_SERIAL_H */
diff --git a/include/linux/ti-emif-sram.h b/include/linux/ti-emif-sram.h
index 441b2988e66a5..b256a9b4ef053 100644
--- a/include/linux/ti-emif-sram.h
+++ b/include/linux/ti-emif-sram.h
@@ -10,7 +10,7 @@
#include <linux/kbuild.h>
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct emif_regs_amx3 {
u32 emif_sdcfg_val;
diff --git a/include/linux/types.h b/include/linux/types.h
index 1c509ce8f7f61..b69e4cdd59b88 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -5,7 +5,7 @@
#define __EXPORTED_HEADERS__
#include <uapi/linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define DECLARE_BITMAP(name,bits) \
unsigned long name[BITS_TO_LONGS(bits)]
@@ -248,5 +248,5 @@ typedef void (*swap_func_t)(void *a, void *b, int size);
typedef int (*cmp_r_func_t)(const void *a, const void *b, const void *priv);
typedef int (*cmp_func_t)(const void *a, const void *b);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _LINUX_TYPES_H */
diff --git a/include/soc/imx/cpu.h b/include/soc/imx/cpu.h
index 0bf610acafd06..8c53150acd76e 100644
--- a/include/soc/imx/cpu.h
+++ b/include/soc/imx/cpu.h
@@ -30,7 +30,7 @@
#define MXC_CPU_VF600 0x600
#define MXC_CPU_VF610 (MXC_CPU_VF600 | MXC_CPU_VFx10)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int __mxc_cpu_type;
#endif
diff --git a/include/soc/tegra/flowctrl.h b/include/soc/tegra/flowctrl.h
index 1aacc5c7a9dba..2a60bd4934c32 100644
--- a/include/soc/tegra/flowctrl.h
+++ b/include/soc/tegra/flowctrl.h
@@ -39,7 +39,7 @@
#define TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP (0xF << 4)
#define TEGRA30_FLOW_CTRL_CSR_WFI_BITMAP (0xF << 8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_SOC_TEGRA_FLOWCTRL
u32 flowctrl_read_cpu_csr(unsigned int cpuid);
void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value);
@@ -67,5 +67,5 @@ static inline void flowctrl_cpu_suspend_exit(unsigned int cpuid)
{
}
#endif /* CONFIG_SOC_TEGRA_FLOWCTRL */
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif /* __SOC_TEGRA_FLOWCTRL_H__ */
diff --git a/include/soc/tegra/fuse.h b/include/soc/tegra/fuse.h
index 8f421b9f7585c..c4f7a1b97c547 100644
--- a/include/soc/tegra/fuse.h
+++ b/include/soc/tegra/fuse.h
@@ -24,7 +24,7 @@
#define TEGRA30_FUSE_SATA_CALIB 0x124
#define TEGRA_FUSE_USB_CALIB_EXT_0 0x250
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum tegra_revision {
TEGRA_REVISION_UNKNOWN = 0,
@@ -122,6 +122,6 @@ static inline int tegra194_miscreg_mask_serror(void)
struct device *tegra_soc_device_register(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __SOC_TEGRA_FUSE_H__ */
diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h
index d967baa0cd0c6..08e246c89ac88 100644
--- a/include/vdso/datapage.h
+++ b/include/vdso/datapage.h
@@ -2,7 +2,7 @@
#ifndef __VDSO_DATAPAGE_H
#define __VDSO_DATAPAGE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <uapi/linux/time.h>
@@ -164,6 +164,6 @@ union vdso_data_store {
#include <asm/vdso/gettimeofday.h>
#endif /* ENABLE_COMPAT_VDSO */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __VDSO_DATAPAGE_H */
diff --git a/include/vdso/helpers.h b/include/vdso/helpers.h
index 3ddb03bb05cbe..c879ab4ca4bd1 100644
--- a/include/vdso/helpers.h
+++ b/include/vdso/helpers.h
@@ -2,7 +2,7 @@
#ifndef __VDSO_HELPERS_H
#define __VDSO_HELPERS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <vdso/datapage.h>
@@ -52,6 +52,6 @@ static __always_inline void vdso_write_end(struct vdso_data *vd)
WRITE_ONCE(vd[CS_RAW].seq, vd[CS_RAW].seq + 1);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __VDSO_HELPERS_H */
diff --git a/include/vdso/processor.h b/include/vdso/processor.h
index fbe8265ea3c49..cc781912a696e 100644
--- a/include/vdso/processor.h
+++ b/include/vdso/processor.h
@@ -5,10 +5,10 @@
#ifndef __VDSO_PROCESSOR_H
#define __VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/vdso/processor.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __VDSO_PROCESSOR_H */
diff --git a/include/vdso/vsyscall.h b/include/vdso/vsyscall.h
index b0fdc9c6bf439..c5c2a2c078571 100644
--- a/include/vdso/vsyscall.h
+++ b/include/vdso/vsyscall.h
@@ -2,13 +2,13 @@
#ifndef __VDSO_VSYSCALL_H
#define __VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/vdso/vsyscall.h>
unsigned long vdso_update_begin(void);
void vdso_update_end(unsigned long flags);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __VDSO_VSYSCALL_H */
diff --git a/include/xen/arm/interface.h b/include/xen/arm/interface.h
index c3eada2642aa9..61360b89da405 100644
--- a/include/xen/arm/interface.h
+++ b/include/xen/arm/interface.h
@@ -30,7 +30,7 @@
#define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Explicitly size integers that represent pfns in the interface with
* Xen so that we can have one ABI that works for 32 and 64 bit guests.
* Note that this means that the xen_pfn_t type may be capable of
diff --git a/include/xen/interface/xen-mca.h b/include/xen/interface/xen-mca.h
index 464aa6b3a5f92..59d31660aec43 100644
--- a/include/xen/interface/xen-mca.h
+++ b/include/xen/interface/xen-mca.h
@@ -50,7 +50,7 @@
/* OUT: There was no machine check data to fetch. */
#define XEN_MC_NODATA 0x2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* vIRQ injected to Dom0 */
#define VIRQ_MCA VIRQ_ARCH_0
@@ -388,5 +388,5 @@ struct xen_mce_log {
#define MCE_GET_LOG_LEN _IOR('M', 2, int)
#define MCE_GETCLEAR_FLAGS _IOR('M', 3, int)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __XEN_PUBLIC_ARCH_X86_MCA_H__ */
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 0ca23eca2a9cc..40c9793e98805 100644
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -337,7 +337,7 @@
#define MMUEXT_MARK_SUPER 19
#define MMUEXT_UNMARK_SUPER 20
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mmuext_op {
unsigned int cmd;
union {
@@ -415,7 +415,7 @@ DEFINE_GUEST_HANDLE_STRUCT(mmuext_op);
#define MAX_VMASST_TYPE 5
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef uint16_t domid_t;
@@ -760,11 +760,11 @@ struct tmem_op {
DEFINE_GUEST_HANDLE(u64);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/* In assembly code we cannot use C numeric constant suffixes. */
#define mk_unsigned_long(x) x
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __XEN_PUBLIC_XEN_H__ */
diff --git a/tools/include/asm-generic/barrier.h b/tools/include/asm-generic/barrier.h
index 6ef36e920ea8a..b61c3bde0447e 100644
--- a/tools/include/asm-generic/barrier.h
+++ b/tools/include/asm-generic/barrier.h
@@ -13,7 +13,7 @@
#ifndef __TOOLS_LINUX_ASM_GENERIC_BARRIER_H
#define __TOOLS_LINUX_ASM_GENERIC_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
@@ -36,5 +36,5 @@
#define wmb() mb()
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __TOOLS_LINUX_ASM_GENERIC_BARRIER_H */
diff --git a/tools/include/asm/alternative.h b/tools/include/asm/alternative.h
index 8e548ac8f740c..85db65074a714 100644
--- a/tools/include/asm/alternative.h
+++ b/tools/include/asm/alternative.h
@@ -3,7 +3,7 @@
#define _TOOLS_ASM_ALTERNATIVE_ASM_H
#if defined(__s390x__)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ALTERNATIVE oldinstr, newinstr, feature
\oldinstr
.endm
diff --git a/tools/include/linux/bits.h b/tools/include/linux/bits.h
index 60044b6088172..7ca8d43b30c11 100644
--- a/tools/include/linux/bits.h
+++ b/tools/include/linux/bits.h
@@ -18,7 +18,7 @@
* position @h. For example
* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
*/
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#include <linux/build_bug.h>
#define GENMASK_INPUT_CHECK(h, l) \
(BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
@@ -36,7 +36,7 @@
#define GENMASK_ULL(h, l) \
(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/*
* Missing asm support
*
diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
index 9c05a59f01842..3d35fe051065e 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -2,7 +2,7 @@
#ifndef _TOOLS_LINUX_COMPILER_H_
#define _TOOLS_LINUX_COMPILER_H_
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler_types.h>
@@ -222,6 +222,6 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
__asm__ ("" : "=r" (var) : "0" (var))
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _TOOLS_LINUX_COMPILER_H */
diff --git a/tools/include/linux/objtool_types.h b/tools/include/linux/objtool_types.h
index df5d9fa84dba3..3d7cbb4360d8e 100644
--- a/tools/include/linux/objtool_types.h
+++ b/tools/include/linux/objtool_types.h
@@ -2,7 +2,7 @@
#ifndef _LINUX_OBJTOOL_TYPES_H
#define _LINUX_OBJTOOL_TYPES_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -18,7 +18,7 @@ struct unwind_hint {
u8 signal;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* UNWIND_HINT_TYPE_UNDEFINED: A blind spot in ORC coverage which can result in
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 03/41] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
2025-03-14 7:09 ` [PATCH 01/41] uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
2025-03-14 7:09 ` [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-06-05 18:12 ` Thomas Huth
2025-03-14 7:09 ` Thomas Huth
` (37 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Richard Henderson,
Matt Turner, linux-alpha
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: Richard Henderson <richard.henderson@linaro.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.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.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 03/41] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers
2025-03-14 7:09 ` [PATCH 03/41] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers Thomas Huth
@ 2025-06-05 18:12 ` Thomas Huth
2025-07-30 7:15 ` Thomas Huth
0 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-05 18:12 UTC (permalink / raw)
To: Richard Henderson, Matt Turner; +Cc: linux-alpha
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: Richard Henderson <richard.henderson@linaro.org>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: linux-alpha@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.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)
Friendly ping!
Richard, Matt, could you maybe pick this up via your alpha 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
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 03/41] alpha: Replace __ASSEMBLY__ with __ASSEMBLER__ in the alpha headers
2025-06-05 18:12 ` Thomas Huth
@ 2025-07-30 7:15 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-07-30 7:15 UTC (permalink / raw)
To: Richard Henderson, Matt Turner; +Cc: linux-alpha
On 05/06/2025 20.12, Thomas Huth wrote:
> 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: Richard Henderson <richard.henderson@linaro.org>
>> Cc: Matt Turner <mattst88@gmail.com>
>> Cc: linux-alpha@vger.kernel.org
>> Signed-off-by: Thomas Huth <thuth@redhat.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)
>
> Friendly ping!
>
> Richard, Matt, could you maybe pick this up via your alpha tree? (x86 and
> parisc already got merge via their respective architecture trees, so I guess
> the same should happen for this patch here, too).
Ping^2! Any chance that you could pick this up for Linux v6.17 ?
Thanks,
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 04/41] arc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (39 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Vineet Gupta,
linux-snps-arc
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arc/include/uapi/asm/ptrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arc/include/uapi/asm/ptrace.h b/arch/arc/include/uapi/asm/ptrace.h
index 2a6eff57f6dd8..3ae832db278cd 100644
--- a/arch/arc/include/uapi/asm/ptrace.h
+++ b/arch/arc/include/uapi/asm/ptrace.h
@@ -14,7 +14,7 @@
#define PTRACE_GET_THREAD_AREA 25
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Userspace ABI: Register state needed by
* -ptrace (gdbserver)
@@ -53,6 +53,6 @@ struct user_regs_arcv2 {
unsigned long r30, r58, r59;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _UAPI__ASM_ARC_PTRACE_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 04/41] arc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
@ 2025-03-14 7:09 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Vineet Gupta,
linux-snps-arc
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arc/include/uapi/asm/ptrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arc/include/uapi/asm/ptrace.h b/arch/arc/include/uapi/asm/ptrace.h
index 2a6eff57f6dd8..3ae832db278cd 100644
--- a/arch/arc/include/uapi/asm/ptrace.h
+++ b/arch/arc/include/uapi/asm/ptrace.h
@@ -14,7 +14,7 @@
#define PTRACE_GET_THREAD_AREA 25
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Userspace ABI: Register state needed by
* -ptrace (gdbserver)
@@ -53,6 +53,6 @@ struct user_regs_arcv2 {
unsigned long r30, r58, r59;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _UAPI__ASM_ARC_PTRACE_H */
--
2.48.1
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
^ permalink raw reply related [flat|nested] 94+ messages in thread
* [PATCH 05/41] arc: Replace __ASSEMBLY__ with __ASSEMBLER__ in the non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (39 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Vineet Gupta,
linux-snps-arc
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: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arc/include/asm/arcregs.h | 2 +-
arch/arc/include/asm/atomic.h | 4 ++--
arch/arc/include/asm/bitops.h | 4 ++--
arch/arc/include/asm/bug.h | 4 ++--
arch/arc/include/asm/cache.h | 4 ++--
arch/arc/include/asm/current.h | 4 ++--
arch/arc/include/asm/dsp-impl.h | 2 +-
arch/arc/include/asm/dsp.h | 4 ++--
arch/arc/include/asm/dwarf.h | 4 ++--
arch/arc/include/asm/entry.h | 4 ++--
arch/arc/include/asm/irqflags-arcv2.h | 4 ++--
arch/arc/include/asm/irqflags-compact.h | 4 ++--
arch/arc/include/asm/jump_label.h | 4 ++--
arch/arc/include/asm/linkage.h | 6 +++---
arch/arc/include/asm/mmu-arcv2.h | 4 ++--
arch/arc/include/asm/mmu.h | 2 +-
arch/arc/include/asm/page.h | 4 ++--
arch/arc/include/asm/pgtable-bits-arcv2.h | 4 ++--
arch/arc/include/asm/pgtable-levels.h | 4 ++--
arch/arc/include/asm/pgtable.h | 4 ++--
arch/arc/include/asm/processor.h | 4 ++--
arch/arc/include/asm/ptrace.h | 4 ++--
arch/arc/include/asm/switch_to.h | 2 +-
arch/arc/include/asm/thread_info.h | 4 ++--
24 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
index 005d9e4d187a0..a31bbf5c8bbc8 100644
--- a/arch/arc/include/asm/arcregs.h
+++ b/arch/arc/include/asm/arcregs.h
@@ -144,7 +144,7 @@
#define ARC_AUX_AGU_MOD2 0x5E2
#define ARC_AUX_AGU_MOD3 0x5E3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <soc/arc/arc_aux.h>
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 592d7fffc223c..e615c42b93bab 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_ATOMIC_H
#define _ASM_ARC_ATOMIC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -31,6 +31,6 @@
#include <asm/atomic64-arcv2.h>
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h
index f5a936496f060..5340c28713927 100644
--- a/arch/arc/include/asm/bitops.h
+++ b/arch/arc/include/asm/bitops.h
@@ -10,7 +10,7 @@
#error only <linux/bitops.h> can be included directly
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -192,6 +192,6 @@ static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-atomic-setbit.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/bug.h b/arch/arc/include/asm/bug.h
index 4c453ba96c519..171c16021f709 100644
--- a/arch/arc/include/asm/bug.h
+++ b/arch/arc/include/asm/bug.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_BUG_H
#define _ASM_ARC_BUG_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
@@ -29,6 +29,6 @@ void die(const char *str, struct pt_regs *regs, unsigned long address);
#include <asm-generic/bug.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h
index f0f1fc5d62b66..040a97f4dd829 100644
--- a/arch/arc/include/asm/cache.h
+++ b/arch/arc/include/asm/cache.h
@@ -23,7 +23,7 @@
*/
#define ARC_UNCACHED_ADDR_SPACE 0xc0000000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/build_bug.h>
@@ -65,7 +65,7 @@
extern int ioc_enable;
extern unsigned long perip_base, perip_end;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Instruction cache related Auxiliary registers */
#define ARC_REG_IC_BCR 0x77 /* Build Config reg */
diff --git a/arch/arc/include/asm/current.h b/arch/arc/include/asm/current.h
index 06be89f6f2f05..03ffd005f3fa6 100644
--- a/arch/arc/include/asm/current.h
+++ b/arch/arc/include/asm/current.h
@@ -9,7 +9,7 @@
#ifndef _ASM_ARC_CURRENT_H
#define _ASM_ARC_CURRENT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_ARC_CURR_IN_REG
@@ -20,6 +20,6 @@ register struct task_struct *curr_arc asm("gp");
#include <asm-generic/current.h>
#endif /* ! CONFIG_ARC_CURR_IN_REG */
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
#endif /* _ASM_ARC_CURRENT_H */
diff --git a/arch/arc/include/asm/dsp-impl.h b/arch/arc/include/asm/dsp-impl.h
index cd5636dfeb6f4..fd5fdaad90c16 100644
--- a/arch/arc/include/asm/dsp-impl.h
+++ b/arch/arc/include/asm/dsp-impl.h
@@ -11,7 +11,7 @@
#define DSP_CTRL_DISABLED_ALL 0
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* clobbers r5 register */
.macro DSP_EARLY_INIT
diff --git a/arch/arc/include/asm/dsp.h b/arch/arc/include/asm/dsp.h
index f496dbc4640b2..eeaaf4e4eabd3 100644
--- a/arch/arc/include/asm/dsp.h
+++ b/arch/arc/include/asm/dsp.h
@@ -7,7 +7,7 @@
#ifndef __ASM_ARC_DSP_H
#define __ASM_ARC_DSP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* DSP-related saved registers - need to be saved only when you are
@@ -24,6 +24,6 @@ struct dsp_callee_regs {
#endif
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_ARC_DSP_H */
diff --git a/arch/arc/include/asm/dwarf.h b/arch/arc/include/asm/dwarf.h
index a0d5ebe1bc3f5..1524c5cf8b59e 100644
--- a/arch/arc/include/asm/dwarf.h
+++ b/arch/arc/include/asm/dwarf.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_DWARF_H
#define _ASM_ARC_DWARF_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef ARC_DW2_UNWIND_AS_CFI
@@ -38,6 +38,6 @@
#endif /* !ARC_DW2_UNWIND_AS_CFI */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_ARC_DWARF_H */
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h
index 38c35722cebf0..f453af251a1a1 100644
--- a/arch/arc/include/asm/entry.h
+++ b/arch/arc/include/asm/entry.h
@@ -13,7 +13,7 @@
#include <asm/processor.h> /* For VMALLOC_START */
#include <asm/mmu.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_ISA_ARCOMPACT
#include <asm/entry-compact.h> /* ISA specific bits */
@@ -146,7 +146,7 @@
#endif /* CONFIG_ARC_CURR_IN_REG */
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
extern void do_signal(struct pt_regs *);
extern void do_notify_resume(struct pt_regs *);
diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h
index fb3c21f1a2383..30aea562f8aa6 100644
--- a/arch/arc/include/asm/irqflags-arcv2.h
+++ b/arch/arc/include/asm/irqflags-arcv2.h
@@ -50,7 +50,7 @@
#define ISA_INIT_STATUS_BITS (STATUS_IE_MASK | __AD_ENB | \
(ARCV2_IRQ_DEF_PRIO << 1))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Save IRQ state and disable IRQs
@@ -170,6 +170,6 @@ static inline void arc_softirq_clear(int irq)
seti
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/irqflags-compact.h b/arch/arc/include/asm/irqflags-compact.h
index 936a2f21f315e..85c2f6bcde0c1 100644
--- a/arch/arc/include/asm/irqflags-compact.h
+++ b/arch/arc/include/asm/irqflags-compact.h
@@ -40,7 +40,7 @@
#define ISA_INIT_STATUS_BITS STATUS_IE_MASK
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/******************************************************************
* IRQ Control Macros
@@ -196,6 +196,6 @@ static inline int arch_irqs_disabled(void)
flag \scratch
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/jump_label.h b/arch/arc/include/asm/jump_label.h
index a339223d9e052..66ead75784d97 100644
--- a/arch/arc/include/asm/jump_label.h
+++ b/arch/arc/include/asm/jump_label.h
@@ -2,7 +2,7 @@
#ifndef _ASM_ARC_JUMP_LABEL_H
#define _ASM_ARC_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
#include <linux/types.h>
@@ -68,5 +68,5 @@ struct jump_entry {
jump_label_t key;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h
index 8a3fb71e9cfad..ba3cb65b5eaa4 100644
--- a/arch/arc/include/asm/linkage.h
+++ b/arch/arc/include/asm/linkage.h
@@ -12,7 +12,7 @@
#define __ALIGN .align 4
#define __ALIGN_STR __stringify(__ALIGN)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ST2 e, o, off
#ifdef CONFIG_ARC_HAS_LL64
@@ -61,7 +61,7 @@
CFI_ENDPROC ASM_NL \
.size name, .-name
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#ifdef CONFIG_ARC_HAS_ICCM
#define __arcfp_code __section(".text.arcfp")
@@ -75,6 +75,6 @@
#define __arcfp_data __section(".data")
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/mmu-arcv2.h b/arch/arc/include/asm/mmu-arcv2.h
index 41412642f2796..5e5482026ac90 100644
--- a/arch/arc/include/asm/mmu-arcv2.h
+++ b/arch/arc/include/asm/mmu-arcv2.h
@@ -69,7 +69,7 @@
#define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK_PHYS | _PAGE_CACHEABLE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
extern int pae40_exist_but_not_enab(void);
@@ -100,6 +100,6 @@ static inline void mmu_setup_pgd(struct mm_struct *mm, void *pgd)
sr \reg, [ARC_REG_PID]
.endm
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h
index 4ae2db59d494c..e3b35ceab582b 100644
--- a/arch/arc/include/asm/mmu.h
+++ b/arch/arc/include/asm/mmu.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_MMU_H
#define _ASM_ARC_MMU_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/threads.h> /* NR_CPUS */
diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h
index def0dfb95b436..9720fe6b2c245 100644
--- a/arch/arc/include/asm/page.h
+++ b/arch/arc/include/asm/page.h
@@ -19,7 +19,7 @@
#endif /* CONFIG_ARC_HAS_PAE40 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define clear_page(paddr) memset((paddr), 0, PAGE_SIZE)
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
@@ -136,6 +136,6 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
#include <asm-generic/memory_model.h> /* page_to_pfn, pfn_to_page */
#include <asm-generic/getorder.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/pgtable-bits-arcv2.h b/arch/arc/include/asm/pgtable-bits-arcv2.h
index 8ebec1b21d246..a8fdb4fe1fbd6 100644
--- a/arch/arc/include/asm/pgtable-bits-arcv2.h
+++ b/arch/arc/include/asm/pgtable-bits-arcv2.h
@@ -75,7 +75,7 @@
* This is to enable COW mechanism
*/
/* xwr */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pte_write(pte) (pte_val(pte) & _PAGE_WRITE)
#define pte_dirty(pte) (pte_val(pte) & _PAGE_DIRTY)
@@ -142,6 +142,6 @@ PTE_BIT_FUNC(swp_clear_exclusive, &= ~(_PAGE_SWP_EXCLUSIVE));
#include <asm/hugepage.h>
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/pgtable-levels.h b/arch/arc/include/asm/pgtable-levels.h
index 86e1482264630..e7680b74e2c68 100644
--- a/arch/arc/include/asm/pgtable-levels.h
+++ b/arch/arc/include/asm/pgtable-levels.h
@@ -85,7 +85,7 @@
#define PTRS_PER_PTE BIT(PMD_SHIFT - PAGE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if CONFIG_PGTABLE_LEVELS > 3
#include <asm-generic/pgtable-nop4d.h>
@@ -183,6 +183,6 @@
#define pmd_leaf(x) (pmd_val(x) & _PAGE_HW_SZ)
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 4cf45a99fd792..bd580e2b62d7c 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -19,7 +19,7 @@
*/
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern char empty_zero_page[PAGE_SIZE];
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
@@ -29,6 +29,6 @@ extern pgd_t swapper_pg_dir[] __aligned(PAGE_SIZE);
/* to cope with aliasing VIPT cache */
#define HAVE_ARCH_UNMAPPED_AREA
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h
index d606658e2fe73..7f7901ac6643c 100644
--- a/arch/arc/include/asm/processor.h
+++ b/arch/arc/include/asm/processor.h
@@ -11,7 +11,7 @@
#ifndef __ASM_ARC_PROCESSOR_H
#define __ASM_ARC_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
#include <asm/dsp.h>
@@ -66,7 +66,7 @@ extern void start_thread(struct pt_regs * regs, unsigned long pc,
extern unsigned int __get_wchan(struct task_struct *p);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Default System Memory Map on ARC
diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h
index cf79df0b25705..f6c052af8f4d3 100644
--- a/arch/arc/include/asm/ptrace.h
+++ b/arch/arc/include/asm/ptrace.h
@@ -10,7 +10,7 @@
#include <uapi/asm/ptrace.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union {
struct {
@@ -172,6 +172,6 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
extern int syscall_trace_enter(struct pt_regs *);
extern void syscall_trace_exit(struct pt_regs *);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_PTRACE_H */
diff --git a/arch/arc/include/asm/switch_to.h b/arch/arc/include/asm/switch_to.h
index 1f85de8288b17..5806106a65f90 100644
--- a/arch/arc/include/asm/switch_to.h
+++ b/arch/arc/include/asm/switch_to.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_SWITCH_TO_H
#define _ASM_ARC_SWITCH_TO_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sched.h>
#include <asm/dsp-impl.h>
diff --git a/arch/arc/include/asm/thread_info.h b/arch/arc/include/asm/thread_info.h
index 12daaf3a61eaf..255d2c7742190 100644
--- a/arch/arc/include/asm/thread_info.h
+++ b/arch/arc/include/asm/thread_info.h
@@ -24,7 +24,7 @@
#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
#define THREAD_SHIFT (PAGE_SHIFT << THREAD_SIZE_ORDER)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/thread_info.h>
@@ -62,7 +62,7 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)
return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* thread information flags
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 05/41] arc: Replace __ASSEMBLY__ with __ASSEMBLER__ in the non-uapi headers
@ 2025-03-14 7:09 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Vineet Gupta,
linux-snps-arc
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: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arc/include/asm/arcregs.h | 2 +-
arch/arc/include/asm/atomic.h | 4 ++--
arch/arc/include/asm/bitops.h | 4 ++--
arch/arc/include/asm/bug.h | 4 ++--
arch/arc/include/asm/cache.h | 4 ++--
arch/arc/include/asm/current.h | 4 ++--
arch/arc/include/asm/dsp-impl.h | 2 +-
arch/arc/include/asm/dsp.h | 4 ++--
arch/arc/include/asm/dwarf.h | 4 ++--
arch/arc/include/asm/entry.h | 4 ++--
arch/arc/include/asm/irqflags-arcv2.h | 4 ++--
arch/arc/include/asm/irqflags-compact.h | 4 ++--
arch/arc/include/asm/jump_label.h | 4 ++--
arch/arc/include/asm/linkage.h | 6 +++---
arch/arc/include/asm/mmu-arcv2.h | 4 ++--
arch/arc/include/asm/mmu.h | 2 +-
arch/arc/include/asm/page.h | 4 ++--
arch/arc/include/asm/pgtable-bits-arcv2.h | 4 ++--
arch/arc/include/asm/pgtable-levels.h | 4 ++--
arch/arc/include/asm/pgtable.h | 4 ++--
arch/arc/include/asm/processor.h | 4 ++--
arch/arc/include/asm/ptrace.h | 4 ++--
arch/arc/include/asm/switch_to.h | 2 +-
arch/arc/include/asm/thread_info.h | 4 ++--
24 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
index 005d9e4d187a0..a31bbf5c8bbc8 100644
--- a/arch/arc/include/asm/arcregs.h
+++ b/arch/arc/include/asm/arcregs.h
@@ -144,7 +144,7 @@
#define ARC_AUX_AGU_MOD2 0x5E2
#define ARC_AUX_AGU_MOD3 0x5E3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <soc/arc/arc_aux.h>
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 592d7fffc223c..e615c42b93bab 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_ATOMIC_H
#define _ASM_ARC_ATOMIC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -31,6 +31,6 @@
#include <asm/atomic64-arcv2.h>
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h
index f5a936496f060..5340c28713927 100644
--- a/arch/arc/include/asm/bitops.h
+++ b/arch/arc/include/asm/bitops.h
@@ -10,7 +10,7 @@
#error only <linux/bitops.h> can be included directly
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -192,6 +192,6 @@ static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)
#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-atomic-setbit.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/bug.h b/arch/arc/include/asm/bug.h
index 4c453ba96c519..171c16021f709 100644
--- a/arch/arc/include/asm/bug.h
+++ b/arch/arc/include/asm/bug.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_BUG_H
#define _ASM_ARC_BUG_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
@@ -29,6 +29,6 @@ void die(const char *str, struct pt_regs *regs, unsigned long address);
#include <asm-generic/bug.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h
index f0f1fc5d62b66..040a97f4dd829 100644
--- a/arch/arc/include/asm/cache.h
+++ b/arch/arc/include/asm/cache.h
@@ -23,7 +23,7 @@
*/
#define ARC_UNCACHED_ADDR_SPACE 0xc0000000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/build_bug.h>
@@ -65,7 +65,7 @@
extern int ioc_enable;
extern unsigned long perip_base, perip_end;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Instruction cache related Auxiliary registers */
#define ARC_REG_IC_BCR 0x77 /* Build Config reg */
diff --git a/arch/arc/include/asm/current.h b/arch/arc/include/asm/current.h
index 06be89f6f2f05..03ffd005f3fa6 100644
--- a/arch/arc/include/asm/current.h
+++ b/arch/arc/include/asm/current.h
@@ -9,7 +9,7 @@
#ifndef _ASM_ARC_CURRENT_H
#define _ASM_ARC_CURRENT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_ARC_CURR_IN_REG
@@ -20,6 +20,6 @@ register struct task_struct *curr_arc asm("gp");
#include <asm-generic/current.h>
#endif /* ! CONFIG_ARC_CURR_IN_REG */
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
#endif /* _ASM_ARC_CURRENT_H */
diff --git a/arch/arc/include/asm/dsp-impl.h b/arch/arc/include/asm/dsp-impl.h
index cd5636dfeb6f4..fd5fdaad90c16 100644
--- a/arch/arc/include/asm/dsp-impl.h
+++ b/arch/arc/include/asm/dsp-impl.h
@@ -11,7 +11,7 @@
#define DSP_CTRL_DISABLED_ALL 0
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* clobbers r5 register */
.macro DSP_EARLY_INIT
diff --git a/arch/arc/include/asm/dsp.h b/arch/arc/include/asm/dsp.h
index f496dbc4640b2..eeaaf4e4eabd3 100644
--- a/arch/arc/include/asm/dsp.h
+++ b/arch/arc/include/asm/dsp.h
@@ -7,7 +7,7 @@
#ifndef __ASM_ARC_DSP_H
#define __ASM_ARC_DSP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* DSP-related saved registers - need to be saved only when you are
@@ -24,6 +24,6 @@ struct dsp_callee_regs {
#endif
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_ARC_DSP_H */
diff --git a/arch/arc/include/asm/dwarf.h b/arch/arc/include/asm/dwarf.h
index a0d5ebe1bc3f5..1524c5cf8b59e 100644
--- a/arch/arc/include/asm/dwarf.h
+++ b/arch/arc/include/asm/dwarf.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_DWARF_H
#define _ASM_ARC_DWARF_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef ARC_DW2_UNWIND_AS_CFI
@@ -38,6 +38,6 @@
#endif /* !ARC_DW2_UNWIND_AS_CFI */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_ARC_DWARF_H */
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h
index 38c35722cebf0..f453af251a1a1 100644
--- a/arch/arc/include/asm/entry.h
+++ b/arch/arc/include/asm/entry.h
@@ -13,7 +13,7 @@
#include <asm/processor.h> /* For VMALLOC_START */
#include <asm/mmu.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_ISA_ARCOMPACT
#include <asm/entry-compact.h> /* ISA specific bits */
@@ -146,7 +146,7 @@
#endif /* CONFIG_ARC_CURR_IN_REG */
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
extern void do_signal(struct pt_regs *);
extern void do_notify_resume(struct pt_regs *);
diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h
index fb3c21f1a2383..30aea562f8aa6 100644
--- a/arch/arc/include/asm/irqflags-arcv2.h
+++ b/arch/arc/include/asm/irqflags-arcv2.h
@@ -50,7 +50,7 @@
#define ISA_INIT_STATUS_BITS (STATUS_IE_MASK | __AD_ENB | \
(ARCV2_IRQ_DEF_PRIO << 1))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Save IRQ state and disable IRQs
@@ -170,6 +170,6 @@ static inline void arc_softirq_clear(int irq)
seti
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/irqflags-compact.h b/arch/arc/include/asm/irqflags-compact.h
index 936a2f21f315e..85c2f6bcde0c1 100644
--- a/arch/arc/include/asm/irqflags-compact.h
+++ b/arch/arc/include/asm/irqflags-compact.h
@@ -40,7 +40,7 @@
#define ISA_INIT_STATUS_BITS STATUS_IE_MASK
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/******************************************************************
* IRQ Control Macros
@@ -196,6 +196,6 @@ static inline int arch_irqs_disabled(void)
flag \scratch
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/jump_label.h b/arch/arc/include/asm/jump_label.h
index a339223d9e052..66ead75784d97 100644
--- a/arch/arc/include/asm/jump_label.h
+++ b/arch/arc/include/asm/jump_label.h
@@ -2,7 +2,7 @@
#ifndef _ASM_ARC_JUMP_LABEL_H
#define _ASM_ARC_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
#include <linux/types.h>
@@ -68,5 +68,5 @@ struct jump_entry {
jump_label_t key;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h
index 8a3fb71e9cfad..ba3cb65b5eaa4 100644
--- a/arch/arc/include/asm/linkage.h
+++ b/arch/arc/include/asm/linkage.h
@@ -12,7 +12,7 @@
#define __ALIGN .align 4
#define __ALIGN_STR __stringify(__ALIGN)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ST2 e, o, off
#ifdef CONFIG_ARC_HAS_LL64
@@ -61,7 +61,7 @@
CFI_ENDPROC ASM_NL \
.size name, .-name
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#ifdef CONFIG_ARC_HAS_ICCM
#define __arcfp_code __section(".text.arcfp")
@@ -75,6 +75,6 @@
#define __arcfp_data __section(".data")
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/mmu-arcv2.h b/arch/arc/include/asm/mmu-arcv2.h
index 41412642f2796..5e5482026ac90 100644
--- a/arch/arc/include/asm/mmu-arcv2.h
+++ b/arch/arc/include/asm/mmu-arcv2.h
@@ -69,7 +69,7 @@
#define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK_PHYS | _PAGE_CACHEABLE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
extern int pae40_exist_but_not_enab(void);
@@ -100,6 +100,6 @@ static inline void mmu_setup_pgd(struct mm_struct *mm, void *pgd)
sr \reg, [ARC_REG_PID]
.endm
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h
index 4ae2db59d494c..e3b35ceab582b 100644
--- a/arch/arc/include/asm/mmu.h
+++ b/arch/arc/include/asm/mmu.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_MMU_H
#define _ASM_ARC_MMU_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/threads.h> /* NR_CPUS */
diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h
index def0dfb95b436..9720fe6b2c245 100644
--- a/arch/arc/include/asm/page.h
+++ b/arch/arc/include/asm/page.h
@@ -19,7 +19,7 @@
#endif /* CONFIG_ARC_HAS_PAE40 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define clear_page(paddr) memset((paddr), 0, PAGE_SIZE)
#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
@@ -136,6 +136,6 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
#include <asm-generic/memory_model.h> /* page_to_pfn, pfn_to_page */
#include <asm-generic/getorder.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/pgtable-bits-arcv2.h b/arch/arc/include/asm/pgtable-bits-arcv2.h
index 8ebec1b21d246..a8fdb4fe1fbd6 100644
--- a/arch/arc/include/asm/pgtable-bits-arcv2.h
+++ b/arch/arc/include/asm/pgtable-bits-arcv2.h
@@ -75,7 +75,7 @@
* This is to enable COW mechanism
*/
/* xwr */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pte_write(pte) (pte_val(pte) & _PAGE_WRITE)
#define pte_dirty(pte) (pte_val(pte) & _PAGE_DIRTY)
@@ -142,6 +142,6 @@ PTE_BIT_FUNC(swp_clear_exclusive, &= ~(_PAGE_SWP_EXCLUSIVE));
#include <asm/hugepage.h>
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/pgtable-levels.h b/arch/arc/include/asm/pgtable-levels.h
index 86e1482264630..e7680b74e2c68 100644
--- a/arch/arc/include/asm/pgtable-levels.h
+++ b/arch/arc/include/asm/pgtable-levels.h
@@ -85,7 +85,7 @@
#define PTRS_PER_PTE BIT(PMD_SHIFT - PAGE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if CONFIG_PGTABLE_LEVELS > 3
#include <asm-generic/pgtable-nop4d.h>
@@ -183,6 +183,6 @@
#define pmd_leaf(x) (pmd_val(x) & _PAGE_HW_SZ)
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 4cf45a99fd792..bd580e2b62d7c 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -19,7 +19,7 @@
*/
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern char empty_zero_page[PAGE_SIZE];
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
@@ -29,6 +29,6 @@ extern pgd_t swapper_pg_dir[] __aligned(PAGE_SIZE);
/* to cope with aliasing VIPT cache */
#define HAVE_ARCH_UNMAPPED_AREA
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h
index d606658e2fe73..7f7901ac6643c 100644
--- a/arch/arc/include/asm/processor.h
+++ b/arch/arc/include/asm/processor.h
@@ -11,7 +11,7 @@
#ifndef __ASM_ARC_PROCESSOR_H
#define __ASM_ARC_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
#include <asm/dsp.h>
@@ -66,7 +66,7 @@ extern void start_thread(struct pt_regs * regs, unsigned long pc,
extern unsigned int __get_wchan(struct task_struct *p);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Default System Memory Map on ARC
diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h
index cf79df0b25705..f6c052af8f4d3 100644
--- a/arch/arc/include/asm/ptrace.h
+++ b/arch/arc/include/asm/ptrace.h
@@ -10,7 +10,7 @@
#include <uapi/asm/ptrace.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union {
struct {
@@ -172,6 +172,6 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
extern int syscall_trace_enter(struct pt_regs *);
extern void syscall_trace_exit(struct pt_regs *);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_PTRACE_H */
diff --git a/arch/arc/include/asm/switch_to.h b/arch/arc/include/asm/switch_to.h
index 1f85de8288b17..5806106a65f90 100644
--- a/arch/arc/include/asm/switch_to.h
+++ b/arch/arc/include/asm/switch_to.h
@@ -6,7 +6,7 @@
#ifndef _ASM_ARC_SWITCH_TO_H
#define _ASM_ARC_SWITCH_TO_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sched.h>
#include <asm/dsp-impl.h>
diff --git a/arch/arc/include/asm/thread_info.h b/arch/arc/include/asm/thread_info.h
index 12daaf3a61eaf..255d2c7742190 100644
--- a/arch/arc/include/asm/thread_info.h
+++ b/arch/arc/include/asm/thread_info.h
@@ -24,7 +24,7 @@
#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
#define THREAD_SHIFT (PAGE_SHIFT << THREAD_SIZE_ORDER)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/thread_info.h>
@@ -62,7 +62,7 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)
return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* thread information flags
--
2.48.1
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 05/41] arc: Replace __ASSEMBLY__ with __ASSEMBLER__ in the non-uapi headers
2025-03-14 7:09 ` Thomas Huth
(?)
@ 2025-06-05 18:21 ` Thomas Huth
2025-06-05 19:49 ` Vineet Gupta
-1 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-05 18:21 UTC (permalink / raw)
To: Vineet Gupta; +Cc: linux-snps-arc
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: Vineet Gupta <vgupta@kernel.org>
> Cc: linux-snps-arc@lists.infradead.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/arc/include/asm/arcregs.h | 2 +-
> arch/arc/include/asm/atomic.h | 4 ++--
> arch/arc/include/asm/bitops.h | 4 ++--
> arch/arc/include/asm/bug.h | 4 ++--
> arch/arc/include/asm/cache.h | 4 ++--
> arch/arc/include/asm/current.h | 4 ++--
> arch/arc/include/asm/dsp-impl.h | 2 +-
> arch/arc/include/asm/dsp.h | 4 ++--
> arch/arc/include/asm/dwarf.h | 4 ++--
> arch/arc/include/asm/entry.h | 4 ++--
> arch/arc/include/asm/irqflags-arcv2.h | 4 ++--
> arch/arc/include/asm/irqflags-compact.h | 4 ++--
> arch/arc/include/asm/jump_label.h | 4 ++--
> arch/arc/include/asm/linkage.h | 6 +++---
> arch/arc/include/asm/mmu-arcv2.h | 4 ++--
> arch/arc/include/asm/mmu.h | 2 +-
> arch/arc/include/asm/page.h | 4 ++--
> arch/arc/include/asm/pgtable-bits-arcv2.h | 4 ++--
> arch/arc/include/asm/pgtable-levels.h | 4 ++--
> arch/arc/include/asm/pgtable.h | 4 ++--
> arch/arc/include/asm/processor.h | 4 ++--
> arch/arc/include/asm/ptrace.h | 4 ++--
> arch/arc/include/asm/switch_to.h | 2 +-
> arch/arc/include/asm/thread_info.h | 4 ++--
> 24 files changed, 45 insertions(+), 45 deletions(-)
>
> diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
> index 005d9e4d187a0..a31bbf5c8bbc8 100644
> --- a/arch/arc/include/asm/arcregs.h
> +++ b/arch/arc/include/asm/arcregs.h
> @@ -144,7 +144,7 @@
> #define ARC_AUX_AGU_MOD2 0x5E2
> #define ARC_AUX_AGU_MOD3 0x5E3
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <soc/arc/arc_aux.h>
>
> diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
> index 592d7fffc223c..e615c42b93bab 100644
> --- a/arch/arc/include/asm/atomic.h
> +++ b/arch/arc/include/asm/atomic.h
> @@ -6,7 +6,7 @@
> #ifndef _ASM_ARC_ATOMIC_H
> #define _ASM_ARC_ATOMIC_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <linux/compiler.h>
> @@ -31,6 +31,6 @@
> #include <asm/atomic64-arcv2.h>
> #endif
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h
> index f5a936496f060..5340c28713927 100644
> --- a/arch/arc/include/asm/bitops.h
> +++ b/arch/arc/include/asm/bitops.h
> @@ -10,7 +10,7 @@
> #error only <linux/bitops.h> can be included directly
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <linux/compiler.h>
> @@ -192,6 +192,6 @@ static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)
> #include <asm-generic/bitops/le.h>
> #include <asm-generic/bitops/ext2-atomic-setbit.h>
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/bug.h b/arch/arc/include/asm/bug.h
> index 4c453ba96c519..171c16021f709 100644
> --- a/arch/arc/include/asm/bug.h
> +++ b/arch/arc/include/asm/bug.h
> @@ -6,7 +6,7 @@
> #ifndef _ASM_ARC_BUG_H
> #define _ASM_ARC_BUG_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
>
> @@ -29,6 +29,6 @@ void die(const char *str, struct pt_regs *regs, unsigned long address);
>
> #include <asm-generic/bug.h>
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h
> index f0f1fc5d62b66..040a97f4dd829 100644
> --- a/arch/arc/include/asm/cache.h
> +++ b/arch/arc/include/asm/cache.h
> @@ -23,7 +23,7 @@
> */
> #define ARC_UNCACHED_ADDR_SPACE 0xc0000000
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/build_bug.h>
>
> @@ -65,7 +65,7 @@
> extern int ioc_enable;
> extern unsigned long perip_base, perip_end;
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> /* Instruction cache related Auxiliary registers */
> #define ARC_REG_IC_BCR 0x77 /* Build Config reg */
> diff --git a/arch/arc/include/asm/current.h b/arch/arc/include/asm/current.h
> index 06be89f6f2f05..03ffd005f3fa6 100644
> --- a/arch/arc/include/asm/current.h
> +++ b/arch/arc/include/asm/current.h
> @@ -9,7 +9,7 @@
> #ifndef _ASM_ARC_CURRENT_H
> #define _ASM_ARC_CURRENT_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #ifdef CONFIG_ARC_CURR_IN_REG
>
> @@ -20,6 +20,6 @@ register struct task_struct *curr_arc asm("gp");
> #include <asm-generic/current.h>
> #endif /* ! CONFIG_ARC_CURR_IN_REG */
>
> -#endif /* ! __ASSEMBLY__ */
> +#endif /* ! __ASSEMBLER__ */
>
> #endif /* _ASM_ARC_CURRENT_H */
> diff --git a/arch/arc/include/asm/dsp-impl.h b/arch/arc/include/asm/dsp-impl.h
> index cd5636dfeb6f4..fd5fdaad90c16 100644
> --- a/arch/arc/include/asm/dsp-impl.h
> +++ b/arch/arc/include/asm/dsp-impl.h
> @@ -11,7 +11,7 @@
>
> #define DSP_CTRL_DISABLED_ALL 0
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> /* clobbers r5 register */
> .macro DSP_EARLY_INIT
> diff --git a/arch/arc/include/asm/dsp.h b/arch/arc/include/asm/dsp.h
> index f496dbc4640b2..eeaaf4e4eabd3 100644
> --- a/arch/arc/include/asm/dsp.h
> +++ b/arch/arc/include/asm/dsp.h
> @@ -7,7 +7,7 @@
> #ifndef __ASM_ARC_DSP_H
> #define __ASM_ARC_DSP_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * DSP-related saved registers - need to be saved only when you are
> @@ -24,6 +24,6 @@ struct dsp_callee_regs {
> #endif
> };
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* __ASM_ARC_DSP_H */
> diff --git a/arch/arc/include/asm/dwarf.h b/arch/arc/include/asm/dwarf.h
> index a0d5ebe1bc3f5..1524c5cf8b59e 100644
> --- a/arch/arc/include/asm/dwarf.h
> +++ b/arch/arc/include/asm/dwarf.h
> @@ -6,7 +6,7 @@
> #ifndef _ASM_ARC_DWARF_H
> #define _ASM_ARC_DWARF_H
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> #ifdef ARC_DW2_UNWIND_AS_CFI
>
> @@ -38,6 +38,6 @@
>
> #endif /* !ARC_DW2_UNWIND_AS_CFI */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_ARC_DWARF_H */
> diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h
> index 38c35722cebf0..f453af251a1a1 100644
> --- a/arch/arc/include/asm/entry.h
> +++ b/arch/arc/include/asm/entry.h
> @@ -13,7 +13,7 @@
> #include <asm/processor.h> /* For VMALLOC_START */
> #include <asm/mmu.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> #ifdef CONFIG_ISA_ARCOMPACT
> #include <asm/entry-compact.h> /* ISA specific bits */
> @@ -146,7 +146,7 @@
>
> #endif /* CONFIG_ARC_CURR_IN_REG */
>
> -#else /* !__ASSEMBLY__ */
> +#else /* !__ASSEMBLER__ */
>
> extern void do_signal(struct pt_regs *);
> extern void do_notify_resume(struct pt_regs *);
> diff --git a/arch/arc/include/asm/irqflags-arcv2.h b/arch/arc/include/asm/irqflags-arcv2.h
> index fb3c21f1a2383..30aea562f8aa6 100644
> --- a/arch/arc/include/asm/irqflags-arcv2.h
> +++ b/arch/arc/include/asm/irqflags-arcv2.h
> @@ -50,7 +50,7 @@
> #define ISA_INIT_STATUS_BITS (STATUS_IE_MASK | __AD_ENB | \
> (ARCV2_IRQ_DEF_PRIO << 1))
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * Save IRQ state and disable IRQs
> @@ -170,6 +170,6 @@ static inline void arc_softirq_clear(int irq)
> seti
> .endm
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/irqflags-compact.h b/arch/arc/include/asm/irqflags-compact.h
> index 936a2f21f315e..85c2f6bcde0c1 100644
> --- a/arch/arc/include/asm/irqflags-compact.h
> +++ b/arch/arc/include/asm/irqflags-compact.h
> @@ -40,7 +40,7 @@
>
> #define ISA_INIT_STATUS_BITS STATUS_IE_MASK
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /******************************************************************
> * IRQ Control Macros
> @@ -196,6 +196,6 @@ static inline int arch_irqs_disabled(void)
> flag \scratch
> .endm
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/jump_label.h b/arch/arc/include/asm/jump_label.h
> index a339223d9e052..66ead75784d97 100644
> --- a/arch/arc/include/asm/jump_label.h
> +++ b/arch/arc/include/asm/jump_label.h
> @@ -2,7 +2,7 @@
> #ifndef _ASM_ARC_JUMP_LABEL_H
> #define _ASM_ARC_JUMP_LABEL_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/stringify.h>
> #include <linux/types.h>
> @@ -68,5 +68,5 @@ struct jump_entry {
> jump_label_t key;
> };
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif
> diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h
> index 8a3fb71e9cfad..ba3cb65b5eaa4 100644
> --- a/arch/arc/include/asm/linkage.h
> +++ b/arch/arc/include/asm/linkage.h
> @@ -12,7 +12,7 @@
> #define __ALIGN .align 4
> #define __ALIGN_STR __stringify(__ALIGN)
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
>
> .macro ST2 e, o, off
> #ifdef CONFIG_ARC_HAS_LL64
> @@ -61,7 +61,7 @@
> CFI_ENDPROC ASM_NL \
> .size name, .-name
>
> -#else /* !__ASSEMBLY__ */
> +#else /* !__ASSEMBLER__ */
>
> #ifdef CONFIG_ARC_HAS_ICCM
> #define __arcfp_code __section(".text.arcfp")
> @@ -75,6 +75,6 @@
> #define __arcfp_data __section(".data")
> #endif
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/mmu-arcv2.h b/arch/arc/include/asm/mmu-arcv2.h
> index 41412642f2796..5e5482026ac90 100644
> --- a/arch/arc/include/asm/mmu-arcv2.h
> +++ b/arch/arc/include/asm/mmu-arcv2.h
> @@ -69,7 +69,7 @@
>
> #define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK_PHYS | _PAGE_CACHEABLE)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct mm_struct;
> extern int pae40_exist_but_not_enab(void);
> @@ -100,6 +100,6 @@ static inline void mmu_setup_pgd(struct mm_struct *mm, void *pgd)
> sr \reg, [ARC_REG_PID]
> .endm
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h
> index 4ae2db59d494c..e3b35ceab582b 100644
> --- a/arch/arc/include/asm/mmu.h
> +++ b/arch/arc/include/asm/mmu.h
> @@ -6,7 +6,7 @@
> #ifndef _ASM_ARC_MMU_H
> #define _ASM_ARC_MMU_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/threads.h> /* NR_CPUS */
>
> diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h
> index def0dfb95b436..9720fe6b2c245 100644
> --- a/arch/arc/include/asm/page.h
> +++ b/arch/arc/include/asm/page.h
> @@ -19,7 +19,7 @@
>
> #endif /* CONFIG_ARC_HAS_PAE40 */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define clear_page(paddr) memset((paddr), 0, PAGE_SIZE)
> #define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
> @@ -136,6 +136,6 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
> #include <asm-generic/memory_model.h> /* page_to_pfn, pfn_to_page */
> #include <asm-generic/getorder.h>
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/pgtable-bits-arcv2.h b/arch/arc/include/asm/pgtable-bits-arcv2.h
> index 8ebec1b21d246..a8fdb4fe1fbd6 100644
> --- a/arch/arc/include/asm/pgtable-bits-arcv2.h
> +++ b/arch/arc/include/asm/pgtable-bits-arcv2.h
> @@ -75,7 +75,7 @@
> * This is to enable COW mechanism
> */
> /* xwr */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define pte_write(pte) (pte_val(pte) & _PAGE_WRITE)
> #define pte_dirty(pte) (pte_val(pte) & _PAGE_DIRTY)
> @@ -142,6 +142,6 @@ PTE_BIT_FUNC(swp_clear_exclusive, &= ~(_PAGE_SWP_EXCLUSIVE));
> #include <asm/hugepage.h>
> #endif
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/pgtable-levels.h b/arch/arc/include/asm/pgtable-levels.h
> index 86e1482264630..e7680b74e2c68 100644
> --- a/arch/arc/include/asm/pgtable-levels.h
> +++ b/arch/arc/include/asm/pgtable-levels.h
> @@ -85,7 +85,7 @@
>
> #define PTRS_PER_PTE BIT(PMD_SHIFT - PAGE_SHIFT)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #if CONFIG_PGTABLE_LEVELS > 3
> #include <asm-generic/pgtable-nop4d.h>
> @@ -183,6 +183,6 @@
> #define pmd_leaf(x) (pmd_val(x) & _PAGE_HW_SZ)
> #endif
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
> index 4cf45a99fd792..bd580e2b62d7c 100644
> --- a/arch/arc/include/asm/pgtable.h
> +++ b/arch/arc/include/asm/pgtable.h
> @@ -19,7 +19,7 @@
> */
> #define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern char empty_zero_page[PAGE_SIZE];
> #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
> @@ -29,6 +29,6 @@ extern pgd_t swapper_pg_dir[] __aligned(PAGE_SIZE);
> /* to cope with aliasing VIPT cache */
> #define HAVE_ARCH_UNMAPPED_AREA
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif
> diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h
> index d606658e2fe73..7f7901ac6643c 100644
> --- a/arch/arc/include/asm/processor.h
> +++ b/arch/arc/include/asm/processor.h
> @@ -11,7 +11,7 @@
> #ifndef __ASM_ARC_PROCESSOR_H
> #define __ASM_ARC_PROCESSOR_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/dsp.h>
> @@ -66,7 +66,7 @@ extern void start_thread(struct pt_regs * regs, unsigned long pc,
>
> extern unsigned int __get_wchan(struct task_struct *p);
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> /*
> * Default System Memory Map on ARC
> diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h
> index cf79df0b25705..f6c052af8f4d3 100644
> --- a/arch/arc/include/asm/ptrace.h
> +++ b/arch/arc/include/asm/ptrace.h
> @@ -10,7 +10,7 @@
> #include <uapi/asm/ptrace.h>
> #include <linux/compiler.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> typedef union {
> struct {
> @@ -172,6 +172,6 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
> extern int syscall_trace_enter(struct pt_regs *);
> extern void syscall_trace_exit(struct pt_regs *);
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* __ASM_PTRACE_H */
> diff --git a/arch/arc/include/asm/switch_to.h b/arch/arc/include/asm/switch_to.h
> index 1f85de8288b17..5806106a65f90 100644
> --- a/arch/arc/include/asm/switch_to.h
> +++ b/arch/arc/include/asm/switch_to.h
> @@ -6,7 +6,7 @@
> #ifndef _ASM_ARC_SWITCH_TO_H
> #define _ASM_ARC_SWITCH_TO_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/sched.h>
> #include <asm/dsp-impl.h>
> diff --git a/arch/arc/include/asm/thread_info.h b/arch/arc/include/asm/thread_info.h
> index 12daaf3a61eaf..255d2c7742190 100644
> --- a/arch/arc/include/asm/thread_info.h
> +++ b/arch/arc/include/asm/thread_info.h
> @@ -24,7 +24,7 @@
> #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
> #define THREAD_SHIFT (PAGE_SHIFT << THREAD_SIZE_ORDER)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/thread_info.h>
>
> @@ -62,7 +62,7 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)
> return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> /*
> * thread information flags
Friendly ping!
Vineet, could you maybe pick this (and the previous patch) up via your arc
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
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 05/41] arc: Replace __ASSEMBLY__ with __ASSEMBLER__ in the non-uapi headers
2025-06-05 18:21 ` Thomas Huth
@ 2025-06-05 19:49 ` Vineet Gupta
0 siblings, 0 replies; 94+ messages in thread
From: Vineet Gupta @ 2025-06-05 19:49 UTC (permalink / raw)
To: Thomas Huth; +Cc: linux-snps-arc
On 6/5/25 11:21, Thomas Huth wrote:
> 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: Vineet Gupta <vgupta@kernel.org>
>> Cc: linux-snps-arc@lists.infradead.org
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
[snip...]
>> Friendly ping!
>>
>> Vineet, could you maybe pick this (and the previous patch) up via your arc
>> tree? (x86 and parisc already got merge via their respective architecture
>> trees, so I guess the same should happen for this patch here, too).
Sorry, this fell thru cracks. I will queue this up for 6.16 fixes, once rc1 is
out and we can start pushing new code for landing into linux-next again.
Thx,
-Vineet
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 06/41] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (4 preceding siblings ...)
2025-03-14 7:09 ` Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 07/41] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (34 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Russell King
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arm/include/uapi/asm/ptrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
index 8896c23ccba78..fb829c96dc2ae 100644
--- a/arch/arm/include/uapi/asm/ptrace.h
+++ b/arch/arm/include/uapi/asm/ptrace.h
@@ -119,7 +119,7 @@
#define PT_DATA_ADDR 0x10004
#define PT_TEXT_END_ADDR 0x10008
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This struct defines the way the registers are stored on the
@@ -158,6 +158,6 @@ struct pt_regs {
#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI__ASM_ARM_PTRACE_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 07/41] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (5 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 06/41] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (33 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Russell King
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: Russell King <linux@armlinux.org.uk>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arm/include/asm/arch_gicv3.h | 4 ++--
arch/arm/include/asm/assembler.h | 2 +-
arch/arm/include/asm/barrier.h | 4 ++--
arch/arm/include/asm/cache.h | 2 +-
arch/arm/include/asm/cp15.h | 4 ++--
arch/arm/include/asm/cputype.h | 4 ++--
arch/arm/include/asm/current.h | 4 ++--
arch/arm/include/asm/delay.h | 4 ++--
arch/arm/include/asm/domain.h | 8 ++++----
arch/arm/include/asm/fpstate.h | 2 +-
arch/arm/include/asm/ftrace.h | 6 +++---
arch/arm/include/asm/hardware/cache-b15-rac.h | 2 +-
arch/arm/include/asm/hardware/cache-l2x0.h | 4 ++--
arch/arm/include/asm/hardware/dec21285.h | 2 +-
arch/arm/include/asm/hardware/ioc.h | 2 +-
arch/arm/include/asm/hardware/iomd.h | 4 ++--
arch/arm/include/asm/hardware/memc.h | 2 +-
arch/arm/include/asm/hwcap.h | 2 +-
arch/arm/include/asm/irq.h | 2 +-
arch/arm/include/asm/jump_label.h | 4 ++--
arch/arm/include/asm/kexec.h | 4 ++--
arch/arm/include/asm/kgdb.h | 4 ++--
arch/arm/include/asm/mach/arch.h | 2 +-
arch/arm/include/asm/mcpm.h | 4 ++--
arch/arm/include/asm/memory.h | 4 ++--
arch/arm/include/asm/mpu.h | 4 ++--
arch/arm/include/asm/opcodes.h | 12 ++++++------
arch/arm/include/asm/page.h | 4 ++--
arch/arm/include/asm/pgtable-2level.h | 4 ++--
arch/arm/include/asm/pgtable-3level.h | 4 ++--
arch/arm/include/asm/pgtable-nommu.h | 4 ++--
arch/arm/include/asm/pgtable.h | 10 +++++-----
arch/arm/include/asm/probes.h | 4 ++--
arch/arm/include/asm/proc-fns.h | 4 ++--
arch/arm/include/asm/ptrace.h | 4 ++--
arch/arm/include/asm/system_info.h | 4 ++--
arch/arm/include/asm/system_misc.h | 4 ++--
arch/arm/include/asm/thread_info.h | 2 +-
arch/arm/include/asm/thread_notify.h | 2 +-
arch/arm/include/asm/tlbflush.h | 10 +++++-----
arch/arm/include/asm/tls.h | 4 ++--
arch/arm/include/asm/unified.h | 6 +++---
arch/arm/include/asm/unwind.h | 4 ++--
arch/arm/include/asm/v7m.h | 4 ++--
arch/arm/include/asm/vdso.h | 4 ++--
arch/arm/include/asm/vdso/cp15.h | 4 ++--
arch/arm/include/asm/vdso/gettimeofday.h | 4 ++--
arch/arm/include/asm/vdso/processor.h | 4 ++--
arch/arm/include/asm/vdso/vsyscall.h | 4 ++--
arch/arm/include/asm/vfp.h | 2 +-
arch/arm/include/asm/virt.h | 4 ++--
arch/arm/mach-at91/pm.h | 2 +-
arch/arm/mach-exynos/smc.h | 4 ++--
| 2 +-
arch/arm/mach-imx/hardware.h | 2 +-
arch/arm/mach-imx/mxc.h | 2 +-
arch/arm/mach-omap2/control.h | 8 ++++----
arch/arm/mach-omap2/soc.h | 4 ++--
arch/arm/mach-omap2/sram.h | 4 ++--
arch/arm/mach-pxa/irqs.h | 2 +-
arch/arm/mach-pxa/pxa-regs.h | 2 +-
arch/arm/mach-s3c/map-base.h | 2 +-
arch/arm/mach-sa1100/include/mach/bitfield.h | 2 +-
arch/arm/mach-sa1100/include/mach/hardware.h | 2 +-
arch/arm/mach-tegra/reset.h | 2 +-
arch/arm/mach-tegra/sleep.h | 2 +-
arch/arm/tools/gen-mach-types | 2 +-
drivers/memory/emif.h | 4 ++--
68 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
index 311e83038bdb3..847590df75511 100644
--- a/arch/arm/include/asm/arch_gicv3.h
+++ b/arch/arm/include/asm/arch_gicv3.h
@@ -7,7 +7,7 @@
#ifndef __ASM_ARCH_GICV3_H
#define __ASM_ARCH_GICV3_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/io.h>
#include <linux/io-64-nonatomic-lo-hi.h>
@@ -257,5 +257,5 @@ static inline bool gic_has_relaxed_pmr_sync(void)
return false;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !__ASM_ARCH_GICV3_H */
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index d33c1e24e00b3..0f1f3b907825e 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -13,7 +13,7 @@
#ifndef __ASM_ASSEMBLER_H__
#define __ASM_ASSEMBLER_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#error "Only include this from assembly code"
#endif
diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
index 83ae97c049d9b..af3516cfa8dcd 100644
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -2,7 +2,7 @@
#ifndef __ASM_BARRIER_H
#define __ASM_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
@@ -99,5 +99,5 @@ static inline unsigned long array_index_mask_nospec(unsigned long idx,
#include <asm-generic/barrier.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_BARRIER_H */
diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
index ecbc100d22a56..38a38a53badc9 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -26,7 +26,7 @@
#define __read_mostly __section(".data..read_mostly")
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_ARCH_HAS_CACHE_LINE_SIZE
int cache_line_size(void);
#endif
diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h
index a54230e656479..603a33c4bf572 100644
--- a/arch/arm/include/asm/cp15.h
+++ b/arch/arm/include/asm/cp15.h
@@ -40,7 +40,7 @@
#define CR_AFE (1 << 29) /* Access flag enable */
#define CR_TE (1 << 30) /* Thumb exception enable */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if __LINUX_ARM_ARCH__ >= 4
#define vectors_high() (get_cr() & CR_V)
@@ -117,6 +117,6 @@ static inline unsigned long get_cr(void)
#endif /* ifdef CONFIG_CPU_CP15 / else */
-#endif /* ifndef __ASSEMBLY__ */
+#endif /* ifndef __ASSEMBLER__ */
#endif
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index 0163c3e78a67f..4b2832e14c3e1 100644
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -109,7 +109,7 @@
/* Qualcomm implemented cores */
#define ARM_CPU_PART_SCORPION 0x510002d0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
#include <linux/kernel.h>
@@ -343,6 +343,6 @@ static inline int __attribute_const__ cpuid_feature_extract_field(u32 features,
#define cpuid_feature_extract(reg, field) \
cpuid_feature_extract_field(read_cpuid_ext(reg), field)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm/include/asm/current.h b/arch/arm/include/asm/current.h
index 5225cb1c803b1..12968d3cdc269 100644
--- a/arch/arm/include/asm/current.h
+++ b/arch/arm/include/asm/current.h
@@ -7,7 +7,7 @@
#ifndef _ASM_ARM_CURRENT_H
#define _ASM_ARM_CURRENT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/insn.h>
struct task_struct;
@@ -60,6 +60,6 @@ static __always_inline __attribute_const__ struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_ARM_CURRENT_H */
diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h
index 1d069e558d8de..6fffc2547f9df 100644
--- a/arch/arm/include/asm/delay.h
+++ b/arch/arm/include/asm/delay.h
@@ -41,7 +41,7 @@
#define UDELAY_MULT UL(2147 * HZ + 483648 * HZ / 1000000)
#define UDELAY_SHIFT 31
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct delay_timer {
unsigned long (*read_current_timer)(void);
@@ -94,7 +94,7 @@ extern void __loop_const_udelay(unsigned long);
#define ARCH_HAS_READ_CURRENT_TIMER
extern void register_current_timer_delay(const struct delay_timer *timer);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* defined(_ARM_DELAY_H) */
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index d48859fdf32c5..66a06feb16c67 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -7,7 +7,7 @@
#ifndef __ASM_PROC_DOMAIN_H
#define __ASM_PROC_DOMAIN_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/thread_info.h>
#include <asm/barrier.h>
#endif
@@ -79,7 +79,7 @@
#define DACR_UACCESS_ENABLE \
(__DACR_DEFAULT | domain_val(DOMAIN_USER, DOMAIN_CLIENT))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_CPU_CP15_MMU
static __always_inline unsigned int get_domain(void)
@@ -124,7 +124,7 @@ static __always_inline void set_domain(unsigned int val)
#define TUSERCOND(instr, cond) #instr #cond
#endif
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/*
* Generate the T (user) versions of the LDR/STR and related
@@ -136,6 +136,6 @@ static __always_inline void set_domain(unsigned int val)
#define TUSER(instr) instr
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* !__ASM_PROC_DOMAIN_H */
diff --git a/arch/arm/include/asm/fpstate.h b/arch/arm/include/asm/fpstate.h
index e29d9c7a52388..2b4469e151851 100644
--- a/arch/arm/include/asm/fpstate.h
+++ b/arch/arm/include/asm/fpstate.h
@@ -9,7 +9,7 @@
#define __ASM_ARM_FPSTATE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* VFP storage area has:
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index 5be3ddc96a503..9675ede04f09c 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -12,7 +12,7 @@
#define MCOUNT_ADDR ((unsigned long)(__gnu_mcount_nc))
#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __gnu_mcount_nc(void);
#ifdef CONFIG_DYNAMIC_FTRACE
@@ -33,7 +33,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND)
/*
@@ -79,6 +79,6 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self,
unsigned long frame_pointer,
unsigned long stack_pointer);
-#endif /* ifndef __ASSEMBLY__ */
+#endif /* ifndef __ASSEMBLER__ */
#endif /* _ASM_ARM_FTRACE */
diff --git a/arch/arm/include/asm/hardware/cache-b15-rac.h b/arch/arm/include/asm/hardware/cache-b15-rac.h
index 3d43ec06fd359..b96365bfb2a87 100644
--- a/arch/arm/include/asm/hardware/cache-b15-rac.h
+++ b/arch/arm/include/asm/hardware/cache-b15-rac.h
@@ -1,7 +1,7 @@
#ifndef __ASM_ARM_HARDWARE_CACHE_B15_RAC_H
#define __ASM_ARM_HARDWARE_CACHE_B15_RAC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void b15_flush_kern_cache_all(void);
diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h
index 5a7ee70f561c9..2c9568768ad73 100644
--- a/arch/arm/include/asm/hardware/cache-l2x0.h
+++ b/arch/arm/include/asm/hardware/cache-l2x0.h
@@ -147,7 +147,7 @@
#define L2X0_WAY_SIZE_SHIFT 3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask);
#if defined(CONFIG_CACHE_L2X0) && defined(CONFIG_OF)
extern int l2x0_of_init(u32 aux_val, u32 aux_mask);
@@ -187,6 +187,6 @@ struct l2x0_regs {
extern struct l2x0_regs l2x0_saved_regs;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm/include/asm/hardware/dec21285.h b/arch/arm/include/asm/hardware/dec21285.h
index 894f2a635cbbd..bf722733bbb6f 100644
--- a/arch/arm/include/asm/hardware/dec21285.h
+++ b/arch/arm/include/asm/hardware/dec21285.h
@@ -15,7 +15,7 @@
#define DC21285_PCI_IO 0x7c000000
#define DC21285_PCI_MEM 0x80000000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <mach/hardware.h>
#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
#else
diff --git a/arch/arm/include/asm/hardware/ioc.h b/arch/arm/include/asm/hardware/ioc.h
index 6edd27fcd0483..bd4f66591026b 100644
--- a/arch/arm/include/asm/hardware/ioc.h
+++ b/arch/arm/include/asm/hardware/ioc.h
@@ -10,7 +10,7 @@
#ifndef __ASMARM_HARDWARE_IOC_H
#define __ASMARM_HARDWARE_IOC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* We use __raw_base variants here so that we give the compiler the
diff --git a/arch/arm/include/asm/hardware/iomd.h b/arch/arm/include/asm/hardware/iomd.h
index 53006ba5350f0..9b8a289f4db63 100644
--- a/arch/arm/include/asm/hardware/iomd.h
+++ b/arch/arm/include/asm/hardware/iomd.h
@@ -11,7 +11,7 @@
#define __ASMARM_HARDWARE_IOMD_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* We use __raw_base variants here so that we give the compiler the
@@ -167,7 +167,7 @@
#define VDMA_START IOMD_VIDSTART
#define VDMA_END IOMD_VIDEND
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int vram_half_sam;
#define video_set_dma(start,end,offset) \
do { \
diff --git a/arch/arm/include/asm/hardware/memc.h b/arch/arm/include/asm/hardware/memc.h
index 1d4ebe0a9678f..8b1865cb564ec 100644
--- a/arch/arm/include/asm/hardware/memc.h
+++ b/arch/arm/include/asm/hardware/memc.h
@@ -10,7 +10,7 @@
#define VDMA_START 1
#define VDMA_END 2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void memc_write(unsigned int reg, unsigned long val);
#define video_set_dma(start,end,offset) \
diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h
index e31d9f1b8549b..d5b5ebaad011b 100644
--- a/arch/arm/include/asm/hwcap.h
+++ b/arch/arm/include/asm/hwcap.h
@@ -4,7 +4,7 @@
#include <uapi/asm/hwcap.h>
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/*
* This yields a mask that user programs can use to figure out what
* instruction set this cpu supports.
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index 26c1d2ced4ce1..7c8f826071162 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -22,7 +22,7 @@
#define NO_IRQ ((unsigned int)(-1))
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct irqaction;
struct pt_regs;
diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h
index a35aba7f548cc..11024b7f1ef4a 100644
--- a/arch/arm/include/asm/jump_label.h
+++ b/arch/arm/include/asm/jump_label.h
@@ -2,7 +2,7 @@
#ifndef _ASM_ARM_JUMP_LABEL_H
#define _ASM_ARM_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/unified.h>
@@ -49,5 +49,5 @@ struct jump_entry {
jump_label_t key;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm/include/asm/kexec.h b/arch/arm/include/asm/kexec.h
index a8287e7ab9d41..8488f4b611402 100644
--- a/arch/arm/include/asm/kexec.h
+++ b/arch/arm/include/asm/kexec.h
@@ -16,7 +16,7 @@
#define KEXEC_ARM_ATAGS_OFFSET 0x1000
#define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define ARCH_HAS_KIMAGE_ARCH
struct kimage_arch {
@@ -78,6 +78,6 @@ static inline struct page *boot_pfn_to_page(unsigned long boot_pfn)
}
#define boot_pfn_to_page boot_pfn_to_page
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ARM_KEXEC_H */
diff --git a/arch/arm/include/asm/kgdb.h b/arch/arm/include/asm/kgdb.h
index 8de1100d10674..1b7c65935976f 100644
--- a/arch/arm/include/asm/kgdb.h
+++ b/arch/arm/include/asm/kgdb.h
@@ -39,7 +39,7 @@
#define KGDB_COMPILED_BREAK 0xe7ffdeff
#define CACHE_FLUSH_IS_SAFE 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void arch_kgdb_breakpoint(void)
{
@@ -49,7 +49,7 @@ static inline void arch_kgdb_breakpoint(void)
extern void kgdb_handle_bus_error(void);
extern int kgdb_fault_expected;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* From Kevin Hilman:
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 2b18a258204d7..ce0137aee0845 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -7,7 +7,7 @@
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/reboot.h>
struct tag;
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h
index 755c97de348c3..743f68f89337e 100644
--- a/arch/arm/include/asm/mcpm.h
+++ b/arch/arm/include/asm/mcpm.h
@@ -24,7 +24,7 @@
#define MAX_NR_CLUSTERS 2
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/cacheflush.h>
@@ -307,7 +307,7 @@ struct sync_struct {
#include <asm/asm-offsets.h>
#define __CACHE_WRITEBACK_GRANULE CACHE_WRITEBACK_GRANULE
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
/* Definitions for mcpm_sync_struct */
#define CPU_DOWN 0x11
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 7c2fa7dcec6d4..308418f236e42 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -98,7 +98,7 @@
#else /* CONFIG_MMU */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long setup_vectors_base(void);
extern unsigned long vectors_base;
#define VECTORS_BASE vectors_base
@@ -155,7 +155,7 @@ extern unsigned long vectors_base;
*/
#define PLAT_PHYS_OFFSET UL(CONFIG_PHYS_OFFSET)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Physical start and end address of the kernel sections. These addresses are
diff --git a/arch/arm/include/asm/mpu.h b/arch/arm/include/asm/mpu.h
index 5e088c83d3d8e..6058788a85730 100644
--- a/arch/arm/include/asm/mpu.h
+++ b/arch/arm/include/asm/mpu.h
@@ -91,7 +91,7 @@
#define PMSAv7_DATA_SIDE 0
#define PMSAv7_INSTR_SIDE 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mpu_rgn {
/* Assume same attributes for d/i-side */
@@ -128,6 +128,6 @@ static inline void pmsav7_setup(void) {};
static inline void pmsav8_setup(void) {};
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm/include/asm/opcodes.h b/arch/arm/include/asm/opcodes.h
index 38e3eabff5c3f..c2e3ed5157cf3 100644
--- a/arch/arm/include/asm/opcodes.h
+++ b/arch/arm/include/asm/opcodes.h
@@ -6,7 +6,7 @@
#ifndef __ASM_ARM_OPCODES_H
#define __ASM_ARM_OPCODES_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr);
#endif
@@ -71,7 +71,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr);
* involving inline assembler. For .S files, the normal __opcode_*() macros
* should do the right thing.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ___opcode_swab32(x) ___asm_opcode_swab32(x)
#define ___opcode_swab16(x) ___asm_opcode_swab16(x)
@@ -80,7 +80,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr);
#define ___opcode_identity32(x) ___asm_opcode_identity32(x)
#define ___opcode_identity16(x) ___asm_opcode_identity16(x)
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
#include <linux/types.h>
#include <linux/swab.h>
@@ -92,7 +92,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr);
#define ___opcode_identity32(x) ((u32)(x))
#define ___opcode_identity16(x) ((u16)(x))
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
#ifdef CONFIG_CPU_ENDIAN_BE8
@@ -111,7 +111,7 @@ extern asmlinkage unsigned int arm_check_condition(u32 opcode, u32 psr);
#define ___asm_opcode_to_mem_arm(x) ___asm_opcode_identity32(x)
#define ___asm_opcode_to_mem_thumb16(x) ___asm_opcode_identity16(x)
#ifdef CONFIG_CPU_ENDIAN_BE32
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* On BE32 systems, using 32-bit accesses to store Thumb instructions will not
* work in all cases, due to alignment constraints. For now, a correct
@@ -219,7 +219,7 @@ extern __u32 __opcode_to_mem_thumb32(__u32);
#endif
/* Helpers for the helpers. Don't use these directly. */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ___inst_arm(x) .long x
#define ___inst_thumb16(x) .short x
#define ___inst_thumb32(first, second) .short first, second
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
index ef11b721230e2..79bdff0c34ab1 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@ -9,7 +9,7 @@
#include <vdso/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef CONFIG_MMU
@@ -180,7 +180,7 @@ extern int pfn_valid(unsigned long);
#define pfn_valid pfn_valid
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#include <asm/memory.h>
diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
index 6b5392e20f411..5edc1f3bdb090 100644
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
@@ -175,7 +175,7 @@
#define L_PTE_MT_VECTORS (_AT(pteval_t, 0x0f) << 2) /* 1111 */
#define L_PTE_MT_MASK (_AT(pteval_t, 0x0f) << 2)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The "pud_xxx()" functions here are trivial when the pmd is folded into
@@ -242,6 +242,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
*/
#define pmd_hugewillfault(pmd) (0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PGTABLE_2LEVEL_H */
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index fa5939eb9864e..102fbfef5f092 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -109,7 +109,7 @@
*/
#define L_PGD_SWAPPER (_AT(pgdval_t, 1) << 55) /* swapper_pg_dir entry */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pud_none(pud) (!pud_val(pud))
#define pud_bad(pud) (!(pud_val(pud) & PUD_TABLE_BIT))
@@ -246,6 +246,6 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
flush_pmd_entry(pmdp);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PGTABLE_3LEVEL_H */
diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h
index 61480d096054d..a8bca82198381 100644
--- a/arch/arm/include/asm/pgtable-nommu.h
+++ b/arch/arm/include/asm/pgtable-nommu.h
@@ -8,7 +8,7 @@
#ifndef _ASMARM_PGTABLE_NOMMU_H
#define _ASMARM_PGTABLE_NOMMU_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/slab.h>
#include <asm/processor.h>
@@ -84,6 +84,6 @@ extern unsigned int kobjsize(const void *objp);
#define v6_user_fns (0)
#define xscale_mc_user_fns (0)
-#endif /*__ASSEMBLY__*/
+#endif /*__ASSEMBLER__*/
#endif /* _ASMARM_PGTABLE_H */
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index be91e376df79e..c14daa2d00012 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -10,7 +10,7 @@
#include <linux/const.h>
#include <asm/proc-fns.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* ZERO_PAGE is a global shared page that is always zero: used
* for zero-mapped memory areas etc..
@@ -53,7 +53,7 @@ extern struct page *empty_zero_page;
#define LIBRARY_TEXT_START 0x0c000000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __pte_error(const char *file, int line, pte_t);
extern void __pmd_error(const char *file, int line, pmd_t);
extern void __pgd_error(const char *file, int line, pgd_t);
@@ -136,7 +136,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
__pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_UNCACHED | L_PTE_XN)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* The table below defines the page protection levels that we insert into our
@@ -147,7 +147,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
* 3) write implies read permissions
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
@@ -331,7 +331,7 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
#define HAVE_ARCH_UNMAPPED_AREA
#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* CONFIG_MMU */
diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h
index ebbd9ec95d21c..0d5067e7f51a9 100644
--- a/arch/arm/include/asm/probes.h
+++ b/arch/arm/include/asm/probes.h
@@ -11,7 +11,7 @@
#ifndef _ASM_PROBES_H
#define _ASM_PROBES_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef u32 probes_opcode_t;
@@ -37,7 +37,7 @@ struct arch_probes_insn {
bool kprobe_direct_exec;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* We assume one instruction can consume at most 64 bytes stack, which is
diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
index b4986a23d8528..fd72f5fac6602 100644
--- a/arch/arm/include/asm/proc-fns.h
+++ b/arch/arm/include/asm/proc-fns.h
@@ -13,7 +13,7 @@
#include <asm/glue-proc.h>
#include <asm/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
@@ -196,6 +196,6 @@ static inline void cpu_set_ttbcr(unsigned int ttbcr)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* __ASM_PROCFNS_H */
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 6eb311fb2da06..de3378a8845ec 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -9,7 +9,7 @@
#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitfield.h>
#include <linux/types.h>
@@ -198,5 +198,5 @@ static inline unsigned long it_advance(unsigned long cpsr)
int syscall_trace_enter(struct pt_regs *regs);
void syscall_trace_exit(struct pt_regs *regs);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm/include/asm/system_info.h b/arch/arm/include/asm/system_info.h
index ef7fdb588b5fe..3a872ec5d4e2e 100644
--- a/arch/arm/include/asm/system_info.h
+++ b/arch/arm/include/asm/system_info.h
@@ -14,7 +14,7 @@
#define CPU_ARCH_ARMv7 9
#define CPU_ARCH_ARMv7M 10
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* information about the system we're running on */
extern unsigned int system_rev;
@@ -25,6 +25,6 @@ extern unsigned int mem_fclk_21285;
extern int __pure cpu_architecture(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_ARM_SYSTEM_INFO_H */
diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h
index 98b37340376bc..8f9f7e833c013 100644
--- a/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@ -2,7 +2,7 @@
#ifndef __ASM_ARM_SYSTEM_MISC_H
#define __ASM_ARM_SYSTEM_MISC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/linkage.h>
@@ -37,6 +37,6 @@ static inline void harden_branch_predictor(void)
extern unsigned int user_debug;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_ARM_SYSTEM_MISC_H */
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 943ffcf069d29..186fd662b1c62 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -33,7 +33,7 @@
#define OVERFLOW_STACK_SIZE SZ_4K
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
diff --git a/arch/arm/include/asm/thread_notify.h b/arch/arm/include/asm/thread_notify.h
index 1c1542e2ed634..eac8fc4837651 100644
--- a/arch/arm/include/asm/thread_notify.h
+++ b/arch/arm/include/asm/thread_notify.h
@@ -9,7 +9,7 @@
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/notifier.h>
#include <asm/thread_info.h>
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h
index 38c6e4a2a0b60..3eb0b3fa6cc9c 100644
--- a/arch/arm/include/asm/tlbflush.h
+++ b/arch/arm/include/asm/tlbflush.h
@@ -7,7 +7,7 @@
#ifndef _ASMARM_TLBFLUSH_H
#define _ASMARM_TLBFLUSH_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# include <linux/mm_types.h>
#endif
@@ -200,7 +200,7 @@
#error Unknown TLB model
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sched.h>
@@ -641,7 +641,7 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,
#elif defined(CONFIG_SMP) /* !CONFIG_MMU */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void local_flush_tlb_all(void) { }
static inline void local_flush_tlb_mm(struct mm_struct *mm) { }
static inline void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) { }
@@ -657,11 +657,11 @@ extern void flush_tlb_kernel_page(unsigned long kaddr);
extern void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end);
extern void flush_tlb_kernel_range(unsigned long start, unsigned long end);
extern void flush_bp_all(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_ARM_ERRATA_798181
extern void erratum_a15_798181_init(void);
#else
diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
index 3dcd0f71a0dae..9b09775e20931 100644
--- a/arch/arm/include/asm/tls.h
+++ b/arch/arm/include/asm/tls.h
@@ -5,7 +5,7 @@
#include <linux/compiler.h>
#include <asm/thread_info.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
.macro switch_tls_none, base, tp, tpuser, tmp1, tmp2
.endm
@@ -68,7 +68,7 @@ ALT_UP_B(.L0_\@)
#define switch_tls switch_tls_software
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void set_tls(unsigned long val)
{
diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index ce9689118dbb9..2cdeafb6afb63 100644
--- a/arch/arm/include/asm/unified.h
+++ b/arch/arm/include/asm/unified.h
@@ -8,7 +8,7 @@
#ifndef __ASM_UNIFIED_H
#define __ASM_UNIFIED_H
-#if defined(__ASSEMBLY__)
+#if defined(__ASSEMBLER__)
.syntax unified
#else
__asm__(".syntax unified");
@@ -29,7 +29,7 @@ __asm__(".syntax unified");
#define ARM(x...)
#define THUMB(x...) x
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define W(instr) instr.w
#else
#define WASM(instr) #instr ".w"
@@ -42,7 +42,7 @@ __asm__(".syntax unified");
#define ARM(x...) x
#define THUMB(x...)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define W(instr) instr
#else
#define WASM(instr) #instr
diff --git a/arch/arm/include/asm/unwind.h b/arch/arm/include/asm/unwind.h
index d60b09a5acfc3..071c89b1b4099 100644
--- a/arch/arm/include/asm/unwind.h
+++ b/arch/arm/include/asm/unwind.h
@@ -8,7 +8,7 @@
#ifndef __ASM_UNWIND_H
#define __ASM_UNWIND_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Unwind reason code according the the ARM EABI documents */
enum unwind_reason_code {
@@ -44,7 +44,7 @@ void __aeabi_unwind_cpp_pr0(void);
void __aeabi_unwind_cpp_pr1(void);
void __aeabi_unwind_cpp_pr2(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_ARM_UNWIND
#define UNWIND(code...) code
diff --git a/arch/arm/include/asm/v7m.h b/arch/arm/include/asm/v7m.h
index 4512f7e1918f0..b334f8009a505 100644
--- a/arch/arm/include/asm/v7m.h
+++ b/arch/arm/include/asm/v7m.h
@@ -89,10 +89,10 @@
#define V7M_SCB_DCCISW 0x274 /* D-cache clean and invalidate by set-way */
#define V7M_SCB_BPIALL 0x278 /* D-cache clean and invalidate by set-way */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum reboot_mode;
void armv7m_restart(enum reboot_mode mode, const char *cmd);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/arm/include/asm/vdso.h b/arch/arm/include/asm/vdso.h
index 5b85889f82eeb..e7ae5e606fab7 100644
--- a/arch/arm/include/asm/vdso.h
+++ b/arch/arm/include/asm/vdso.h
@@ -4,7 +4,7 @@
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
@@ -24,7 +24,7 @@ static inline void arm_install_vdso(struct mm_struct *mm, unsigned long addr)
#endif /* CONFIG_VDSO */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
diff --git a/arch/arm/include/asm/vdso/cp15.h b/arch/arm/include/asm/vdso/cp15.h
index bed16fa1865e9..f5dea30743765 100644
--- a/arch/arm/include/asm/vdso/cp15.h
+++ b/arch/arm/include/asm/vdso/cp15.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_CP15_H
#define __ASM_VDSO_CP15_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_CPU_CP15
@@ -33,6 +33,6 @@
#endif /* CONFIG_CPU_CP15 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_CP15_H */
diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/asm/vdso/gettimeofday.h
index 592d3d015ca72..25471296313a7 100644
--- a/arch/arm/include/asm/vdso/gettimeofday.h
+++ b/arch/arm/include/asm/vdso/gettimeofday.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <asm/errno.h>
@@ -140,6 +140,6 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void)
return _vdso_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/arm/include/asm/vdso/processor.h b/arch/arm/include/asm/vdso/processor.h
index 45efb3ff511c9..b24304f248b71 100644
--- a/arch/arm/include/asm/vdso/processor.h
+++ b/arch/arm/include/asm/vdso/processor.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if __LINUX_ARM_ARCH__ == 6 || defined(CONFIG_ARM_ERRATA_754327)
#define cpu_relax() \
@@ -17,6 +17,6 @@
#define cpu_relax() barrier()
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/arm/include/asm/vdso/vsyscall.h b/arch/arm/include/asm/vdso/vsyscall.h
index 705414710dcdb..dce604ccdcca7 100644
--- a/arch/arm/include/asm/vdso/vsyscall.h
+++ b/arch/arm/include/asm/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
#include <asm/cacheflush.h>
@@ -27,6 +27,6 @@ void __arm_sync_vdso_data(struct vdso_data *vdata)
/* 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 */
diff --git a/arch/arm/include/asm/vfp.h b/arch/arm/include/asm/vfp.h
index 85ccc422d4d0b..94171e09bda0b 100644
--- a/arch/arm/include/asm/vfp.h
+++ b/arch/arm/include/asm/vfp.h
@@ -90,7 +90,7 @@
#define VFPOPDESC_UNUSED_MASK (0xFF << VFPOPDESC_UNUSED_BIT)
#define VFPOPDESC_OPDESC_MASK (~(VFPOPDESC_LENGTH_MASK | VFPOPDESC_UNUSED_MASK))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void vfp_disable(void);
#endif
diff --git a/arch/arm/include/asm/virt.h b/arch/arm/include/asm/virt.h
index dd9697b2bde80..719a08fa6a29b 100644
--- a/arch/arm/include/asm/virt.h
+++ b/arch/arm/include/asm/virt.h
@@ -15,7 +15,7 @@
*/
#define BOOT_CPU_MODE_MISMATCH PSR_N_BIT
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cacheflush.h>
#ifdef CONFIG_ARM_VIRT_EXT
@@ -74,7 +74,7 @@ static inline bool is_kernel_in_hyp_mode(void)
#define HVC_SET_VECTORS 0
#define HVC_SOFT_RESTART 1
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define HVC_STUB_ERR 0xbadca11
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index 53bdc9000e447..d5a25cc90f26e 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -25,7 +25,7 @@
#define AT91_PM_ULP1 0x03
#define AT91_PM_BACKUP 0x04
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct at91_pm_data {
void __iomem *pmc;
void __iomem *ramc[2];
diff --git a/arch/arm/mach-exynos/smc.h b/arch/arm/mach-exynos/smc.h
index 5c30feb8f07d9..5c7730f6259fc 100644
--- a/arch/arm/mach-exynos/smc.h
+++ b/arch/arm/mach-exynos/smc.h
@@ -32,11 +32,11 @@
#define SMC_REG_CLASS_SFR_W (0x1 << 30)
#define SMC_REG_ID_SFR_W(addr) (SMC_REG_CLASS_SFR_W | ((addr) >> 2))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* op type for SMC_CMD_SAVE and SMC_CMD_SHUTDOWN */
#define OP_TYPE_CORE 0x0
--git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h
index 985ad3a956712..5391848d8c8cc 100644
--- a/arch/arm/mach-footbridge/include/mach/hardware.h
+++ b/arch/arm/mach-footbridge/include/mach/hardware.h
@@ -79,7 +79,7 @@
#define CPLD_UNMUTE 2
#define CPLD_FLASH_WR_ENABLE 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern raw_spinlock_t nw_gpio_lock;
extern void nw_gpio_modify_op(unsigned int mask, unsigned int set);
extern void nw_gpio_modify_io(unsigned int mask, unsigned int in);
diff --git a/arch/arm/mach-imx/hardware.h b/arch/arm/mach-imx/hardware.h
index 0760fff39a0b3..71f09648c7778 100644
--- a/arch/arm/mach-imx/hardware.h
+++ b/arch/arm/mach-imx/hardware.h
@@ -7,7 +7,7 @@
#ifndef __ASM_ARCH_MXC_HARDWARE_H__
#define __ASM_ARCH_MXC_HARDWARE_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/io.h>
#include <soc/imx/revision.h>
#endif
diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
index fe2d0f5abfcc2..1d13e3959159e 100644
--- a/arch/arm/mach-imx/mxc.h
+++ b/arch/arm/mach-imx/mxc.h
@@ -16,7 +16,7 @@
#define IMX_DDR_TYPE_LPDDR2 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_SOC_IMX6SL
static inline bool cpu_is_imx6sl(void)
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index 7e7440533bf90..e4f4b16958084 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -18,7 +18,7 @@
#include "am33xx.h"
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define OMAP242X_CTRL_REGADDR(reg) \
OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE + (reg))
#define OMAP243X_CTRL_REGADDR(reg) \
@@ -36,7 +36,7 @@
OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))
#define AM33XX_CTRL_REGADDR(reg) \
AM33XX_L4_WK_IO_ADDRESS(AM33XX_SCM_BASE + (reg))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* As elsewhere, the "OMAP2_" prefix indicates that the macro is valid for
@@ -503,7 +503,7 @@
#define FEAT_NEON_NONE 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_ARCH_OMAP2PLUS
extern u8 omap_ctrl_readb(u16 offset);
extern u16 omap_ctrl_readw(u16 offset);
@@ -534,7 +534,7 @@ int omap_control_init(void);
#define omap_ctrl_writel(x, y) WARN_ON(1)
#define omap4_ctrl_pad_writel(x, y) WARN_ON(1)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ARCH_ARM_MACH_OMAP2_CONTROL_H */
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 9e3dbb743e5c4..b3949559edadf 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -19,7 +19,7 @@
#include "am33xx.h"
#include "omap54xx.h"
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitops.h>
#include <linux/of.h>
@@ -501,4 +501,4 @@ level(__##fn);
#define cpu_is_ti816x() soc_is_ti816x()
#define cpu_is_ti81xx() soc_is_ti81xx()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/arm/mach-omap2/sram.h b/arch/arm/mach-omap2/sram.h
index 030cabc39821d..a1d72e014e62b 100644
--- a/arch/arm/mach-omap2/sram.h
+++ b/arch/arm/mach-omap2/sram.h
@@ -3,7 +3,7 @@
* Interface for functions that need to be run in internal SRAM
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,
u32 base_cs, u32 force_unlock);
@@ -48,7 +48,7 @@ extern void omap_push_sram_idle(void);
static inline void omap_push_sram_idle(void) {}
#endif /* CONFIG_PM */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* OMAP2+: define the SRAM PA addresses.
diff --git a/arch/arm/mach-pxa/irqs.h b/arch/arm/mach-pxa/irqs.h
index 22bf536a462d0..07d7aa3a65065 100644
--- a/arch/arm/mach-pxa/irqs.h
+++ b/arch/arm/mach-pxa/irqs.h
@@ -94,7 +94,7 @@
#define PXA_NR_IRQS (IRQ_BOARD_START)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct irq_data;
struct pt_regs;
diff --git a/arch/arm/mach-pxa/pxa-regs.h b/arch/arm/mach-pxa/pxa-regs.h
index ba5120c06b8a5..b56c8899042c4 100644
--- a/arch/arm/mach-pxa/pxa-regs.h
+++ b/arch/arm/mach-pxa/pxa-regs.h
@@ -31,7 +31,7 @@
#define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1))
#define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# define __REG(x) (*((volatile u32 __iomem *)io_p2v(x)))
/* With indexed regs we don't want to feed the index through io_p2v()
diff --git a/arch/arm/mach-s3c/map-base.h b/arch/arm/mach-s3c/map-base.h
index 463a995b399bc..beb58e6f12e16 100644
--- a/arch/arm/mach-s3c/map-base.h
+++ b/arch/arm/mach-s3c/map-base.h
@@ -20,7 +20,7 @@
#define S3C_ADDR_BASE 0xF6000000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define S3C_ADDR(x) ((void __iomem __force *)S3C_ADDR_BASE + (x))
#else
#define S3C_ADDR(x) (S3C_ADDR_BASE + (x))
diff --git a/arch/arm/mach-sa1100/include/mach/bitfield.h b/arch/arm/mach-sa1100/include/mach/bitfield.h
index f1f0e3387d9c6..e786bf730b31c 100644
--- a/arch/arm/mach-sa1100/include/mach/bitfield.h
+++ b/arch/arm/mach-sa1100/include/mach/bitfield.h
@@ -15,7 +15,7 @@
#ifndef __BITFIELD_H
#define __BITFIELD_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define UData(Data) ((unsigned long) (Data))
#else
#define UData(Data) (Data)
diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h
index 6f2dbdc286632..350e2665ca495 100644
--- a/arch/arm/mach-sa1100/include/mach/hardware.h
+++ b/arch/arm/mach-sa1100/include/mach/hardware.h
@@ -39,7 +39,7 @@
#define __MREG(x) IOMEM(io_p2v(x))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# define __REG(x) (*((volatile unsigned long __iomem *)io_p2v(x)))
# define __PREG(x) (io_v2p((unsigned long)&(x)))
diff --git a/arch/arm/mach-tegra/reset.h b/arch/arm/mach-tegra/reset.h
index 51265592cb1ae..92a89713d5e57 100644
--- a/arch/arm/mach-tegra/reset.h
+++ b/arch/arm/mach-tegra/reset.h
@@ -21,7 +21,7 @@
#define RESET_DATA(x) ((TEGRA_RESET_##x)*4)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include "irammap.h"
diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h
index 4718a3cb45a16..e332d261c1dbd 100644
--- a/arch/arm/mach-tegra/sleep.h
+++ b/arch/arm/mach-tegra/sleep.h
@@ -38,7 +38,7 @@
#define TEGRA_FLUSH_CACHE_LOUIS 0
#define TEGRA_FLUSH_CACHE_ALL 1
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* waits until the microsecond counter (base) is > rn */
.macro wait_until, rn, base, tmp
add \rn, \rn, #1
diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types
index cbe1c33bb8710..6ad8f055ba6b5 100644
--- a/arch/arm/tools/gen-mach-types
+++ b/arch/arm/tools/gen-mach-types
@@ -29,7 +29,7 @@ END {
printf(" */\n\n");
printf("#ifndef __ASM_ARM_MACH_TYPE_H\n");
printf("#define __ASM_ARM_MACH_TYPE_H\n\n");
- printf("#ifndef __ASSEMBLY__\n");
+ printf("#ifndef __ASSEMBLER__\n");
printf("/* The type of machine we're running on */\n");
printf("extern unsigned int __machine_arch_type;\n");
printf("#endif\n\n");
diff --git a/drivers/memory/emif.h b/drivers/memory/emif.h
index 55aeb36a5bf24..5dfb09adb0960 100644
--- a/drivers/memory/emif.h
+++ b/drivers/memory/emif.h
@@ -558,7 +558,7 @@
#define EMIF_SRAM_AM33_REG_LAYOUT 0x00000000
#define EMIF_SRAM_AM43_REG_LAYOUT 0x00000001
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Structure containing shadow of important registers in EMIF
* The calculation function fills in this structure to be later used for
@@ -603,5 +603,5 @@ void ti_emif_enter_sr(void);
void ti_emif_exit_sr(void);
void ti_emif_abort_sr(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __EMIF_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (6 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 07/41] arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 11:55 ` Will Deacon
2025-03-14 7:09 ` [PATCH 09/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (32 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Catalin Marinas,
Will Deacon
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arm64/include/uapi/asm/kvm.h | 2 +-
arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h
index 568bf858f3198..f1ee246f7b14e 100644
--- a/arch/arm64/include/uapi/asm/kvm.h
+++ b/arch/arm64/include/uapi/asm/kvm.h
@@ -31,7 +31,7 @@
#define KVM_SPSR_FIQ 4
#define KVM_NR_SPSR 5
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/psci.h>
#include <linux/types.h>
#include <asm/ptrace.h>
diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
index 0f39ba4f3efd4..6fed93fb2536f 100644
--- a/arch/arm64/include/uapi/asm/ptrace.h
+++ b/arch/arm64/include/uapi/asm/ptrace.h
@@ -80,7 +80,7 @@
#define PTRACE_PEEKMTETAGS 33
#define PTRACE_POKEMTETAGS 34
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* User structures for general purpose, floating point and debug registers.
@@ -332,6 +332,6 @@ struct user_gcs {
__u64 gcspr_el0;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI__ASM_PTRACE_H */
diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h
index d42f7a92238b9..e29bf3e2d0ccd 100644
--- a/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
@@ -17,7 +17,7 @@
#ifndef _UAPI__ASM_SIGCONTEXT_H
#define _UAPI__ASM_SIGCONTEXT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -192,7 +192,7 @@ struct gcs_context {
__u64 reserved;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#include <asm/sve_context.h>
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 ` [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 11:55 ` Will Deacon
2025-03-14 12:05 ` Arnd Bergmann
0 siblings, 1 reply; 94+ messages in thread
From: Will Deacon @ 2025-03-14 11:55 UTC (permalink / raw)
To: Thomas Huth; +Cc: linux-kernel, Arnd Bergmann, linux-arch, Catalin Marinas
On Fri, Mar 14, 2025 at 08:09:39AM +0100, Thomas Huth wrote:
> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> this is not really useful for uapi headers (unless the userspace
> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> gets set automatically by the compiler when compiling assembly
> code.
>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/arm64/include/uapi/asm/kvm.h | 2 +-
> arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
> arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
Is there a risk of breaking userspace with this? I wonder if it would
be more conservative to do something like:
#if !defined(__ASSEMBLY__) && !defined(__ASSEMBLER__)
so that if somebody is doing '#define __ASSEMBLY__' then they get the
same behaviour as today.
Or maybe we don't care?
Will
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 11:55 ` Will Deacon
@ 2025-03-14 12:05 ` Arnd Bergmann
2025-03-14 13:42 ` Will Deacon
0 siblings, 1 reply; 94+ messages in thread
From: Arnd Bergmann @ 2025-03-14 12:05 UTC (permalink / raw)
To: Will Deacon, Thomas Huth; +Cc: linux-kernel, Linux-Arch, Catalin Marinas
On Fri, Mar 14, 2025, at 12:55, Will Deacon wrote:
> On Fri, Mar 14, 2025 at 08:09:39AM +0100, Thomas Huth wrote:
>> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
>> this is not really useful for uapi headers (unless the userspace
>> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
>> gets set automatically by the compiler when compiling assembly
>> code.
>>
>> Cc: Catalin Marinas <catalin.marinas@arm.com>
>> Cc: Will Deacon <will@kernel.org>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> arch/arm64/include/uapi/asm/kvm.h | 2 +-
>> arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
>> arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
>> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> Is there a risk of breaking userspace with this? I wonder if it would
> be more conservative to do something like:
>
> #if !defined(__ASSEMBLY__) && !defined(__ASSEMBLER__)
>
> so that if somebody is doing '#define __ASSEMBLY__' then they get the
> same behaviour as today.
>
> Or maybe we don't care?
I think the main risk we would have is user applications relying
on the __ASSEMBLER__ checks in new kernel headers and not defining
__ASSEMBLY__. This would result in the application not building
against old kernel headers that only check against __ASSEMBLY__.
Checking for both in the kernel headers does not solve this
problem, and I think we can still decide that we don't care:
in the worst case, an application using the headers from assembly
will have to get fixed later when it needs to be built against
old headers.
I checked that old gcc versions pass __ASSEMBLY__ at least as
far back as gcc-2.95, and it should be completely safe to
assume that no older gcc versions would be used on kernel
headers, and they probably would choke on c99 features like
'long long'. I would also assume that any other compiler that
may be used to include kernel headers has to have enough
gcc compatibility to define all the common macros.
Arnd
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 12:05 ` Arnd Bergmann
@ 2025-03-14 13:42 ` Will Deacon
2025-03-14 18:01 ` Thomas Huth
2025-10-10 13:05 ` Thomas Huth
0 siblings, 2 replies; 94+ messages in thread
From: Will Deacon @ 2025-03-14 13:42 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Thomas Huth, linux-kernel, Linux-Arch, Catalin Marinas
On Fri, Mar 14, 2025 at 01:05:15PM +0100, Arnd Bergmann wrote:
> On Fri, Mar 14, 2025, at 12:55, Will Deacon wrote:
> > On Fri, Mar 14, 2025 at 08:09:39AM +0100, Thomas Huth wrote:
> >> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> >> this is not really useful for uapi headers (unless the userspace
> >> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> >> gets set automatically by the compiler when compiling assembly
> >> code.
> >>
> >> Cc: Catalin Marinas <catalin.marinas@arm.com>
> >> Cc: Will Deacon <will@kernel.org>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >> arch/arm64/include/uapi/asm/kvm.h | 2 +-
> >> arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
> >> arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
> >> 3 files changed, 5 insertions(+), 5 deletions(-)
> >
> > Is there a risk of breaking userspace with this? I wonder if it would
> > be more conservative to do something like:
> >
> > #if !defined(__ASSEMBLY__) && !defined(__ASSEMBLER__)
> >
> > so that if somebody is doing '#define __ASSEMBLY__' then they get the
> > same behaviour as today.
> >
> > Or maybe we don't care?
>
> I think the main risk we would have is user applications relying
> on the __ASSEMBLER__ checks in new kernel headers and not defining
> __ASSEMBLY__. This would result in the application not building
> against old kernel headers that only check against __ASSEMBLY__.
Hmm. I hadn't thought about the case of old headers :/
A quick Debian codesearch shows that glibc might #define __ASSEMBLY__
for some arch-specific headers:
https://codesearch.debian.net/search?q=%23define+__ASSEMBLY__&literal=1
which is what I was more worried about.
> Checking for both in the kernel headers does not solve this
> problem, and I think we can still decide that we don't care:
> in the worst case, an application using the headers from assembly
> will have to get fixed later when it needs to be built against
> old headers.
Old headers might also just be missing definitions that the application
wants, so I suppose there's always the potential for some manual effort
in that case.
Will
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 13:42 ` Will Deacon
@ 2025-03-14 18:01 ` Thomas Huth
2025-10-10 13:05 ` Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 18:01 UTC (permalink / raw)
To: Will Deacon, Arnd Bergmann; +Cc: linux-kernel, Linux-Arch, Catalin Marinas
On 14/03/2025 14.42, Will Deacon wrote:
> On Fri, Mar 14, 2025 at 01:05:15PM +0100, Arnd Bergmann wrote:
>> On Fri, Mar 14, 2025, at 12:55, Will Deacon wrote:
>>> On Fri, Mar 14, 2025 at 08:09:39AM +0100, Thomas Huth wrote:
>>>> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
>>>> this is not really useful for uapi headers (unless the userspace
>>>> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
>>>> gets set automatically by the compiler when compiling assembly
>>>> code.
>>>>
>>>> Cc: Catalin Marinas <catalin.marinas@arm.com>
>>>> Cc: Will Deacon <will@kernel.org>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>> arch/arm64/include/uapi/asm/kvm.h | 2 +-
>>>> arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
>>>> arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
>>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>> Is there a risk of breaking userspace with this? I wonder if it would
>>> be more conservative to do something like:
>>>
>>> #if !defined(__ASSEMBLY__) && !defined(__ASSEMBLER__)
>>>
>>> so that if somebody is doing '#define __ASSEMBLY__' then they get the
>>> same behaviour as today.
>>>
>>> Or maybe we don't care?
>>
>> I think the main risk we would have is user applications relying
>> on the __ASSEMBLER__ checks in new kernel headers and not defining
>> __ASSEMBLY__. This would result in the application not building
>> against old kernel headers that only check against __ASSEMBLY__.
>
> Hmm. I hadn't thought about the case of old headers :/
>
> A quick Debian codesearch shows that glibc might #define __ASSEMBLY__
> for some arch-specific headers:
>
> https://codesearch.debian.net/search?q=%23define+__ASSEMBLY__&literal=1
>
> which is what I was more worried about.
Since both, GCC and Clang, define __ASSEMBLER__ since a long time (Arnd
checked GCC 2.95, and I checked that at least Clang 7.0 still has it), I
think the only problem might be other compiler toolchains that might not set
__ASSEMBLER__ automatically. I just checked Tiny-C 0.9.27, and that also
sets __ASSEMBLER__ already. And according to
https://github.com/IanHarvey/pcc/blob/master/cc/cc/cc.1#L405 it is also set
in PCC.
I haven't spotted it in LCC though (which seems to be an old C89 compiler if
I got it right). So if we are worried about such exotic old compilers, it's
maybe better to check both, __ASSEMBLY__ and __ASSEMBLER__ in the uapi
files? Or would it be ok to force those few people to set __ASSEMBLER__
manually in their Makefiles (just like they had to do before with
__ASSEMBLY__) in case they want to compile assembler code with such exotic
compilers and new kernel headers?
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 13:42 ` Will Deacon
2025-03-14 18:01 ` Thomas Huth
@ 2025-10-10 13:05 ` Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-10-10 13:05 UTC (permalink / raw)
To: Will Deacon, Arnd Bergmann; +Cc: linux-kernel, Linux-Arch, Catalin Marinas
On 14/03/2025 14.42, Will Deacon wrote:
> On Fri, Mar 14, 2025 at 01:05:15PM +0100, Arnd Bergmann wrote:
>> On Fri, Mar 14, 2025, at 12:55, Will Deacon wrote:
>>> On Fri, Mar 14, 2025 at 08:09:39AM +0100, Thomas Huth wrote:
>>>> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
>>>> this is not really useful for uapi headers (unless the userspace
>>>> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
>>>> gets set automatically by the compiler when compiling assembly
>>>> code.
>>>>
>>>> Cc: Catalin Marinas <catalin.marinas@arm.com>
>>>> Cc: Will Deacon <will@kernel.org>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>> arch/arm64/include/uapi/asm/kvm.h | 2 +-
>>>> arch/arm64/include/uapi/asm/ptrace.h | 4 ++--
>>>> arch/arm64/include/uapi/asm/sigcontext.h | 4 ++--
>>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>> Is there a risk of breaking userspace with this? I wonder if it would
>>> be more conservative to do something like:
>>>
>>> #if !defined(__ASSEMBLY__) && !defined(__ASSEMBLER__)
>>>
>>> so that if somebody is doing '#define __ASSEMBLY__' then they get the
>>> same behaviour as today.
>>>
>>> Or maybe we don't care?
>>
>> I think the main risk we would have is user applications relying
>> on the __ASSEMBLER__ checks in new kernel headers and not defining
>> __ASSEMBLY__. This would result in the application not building
>> against old kernel headers that only check against __ASSEMBLY__.
>
> Hmm. I hadn't thought about the case of old headers :/
>
> A quick Debian codesearch shows that glibc might #define __ASSEMBLY__
> for some arch-specific headers:
>
> https://codesearch.debian.net/search?q=%23define+__ASSEMBLY__&literal=1
>
> which is what I was more worried about.
Hi!
FWIW, the x86 patches have been merged since kernel v6.15, and as far as I
know, there haven't been any complaints about the change there yet. Thus I
assume the changes should be ok.
So I rebased the arm64 patch now, too, and resend them separately as a v2:
https://lore.kernel.org/lkml/20251010130116.828465-1-thuth@redhat.com/
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 09/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (7 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 08/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 10/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi header Thomas Huth
` (31 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Catalin Marinas,
Will Deacon
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 mostly mechanical patch (done with a simple "sed -i"
statement), except for the following files where comments with
mis-spelled macros were tweaked manually:
arch/arm64/include/asm/stacktrace/frame.h
arch/arm64/include/asm/kvm_ptrauth.h
arch/arm64/include/asm/debug-monitors.h
arch/arm64/include/asm/esr.h
arch/arm64/include/asm/scs.h
arch/arm64/include/asm/memory.h
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/arm64/include/asm/alternative-macros.h | 8 ++++----
arch/arm64/include/asm/alternative.h | 4 ++--
arch/arm64/include/asm/arch_gicv3.h | 4 ++--
arch/arm64/include/asm/asm-extable.h | 6 +++---
arch/arm64/include/asm/assembler.h | 2 +-
arch/arm64/include/asm/barrier.h | 4 ++--
arch/arm64/include/asm/cache.h | 4 ++--
arch/arm64/include/asm/cpucaps.h | 4 ++--
arch/arm64/include/asm/cpufeature.h | 4 ++--
arch/arm64/include/asm/cputype.h | 4 ++--
arch/arm64/include/asm/current.h | 4 ++--
arch/arm64/include/asm/debug-monitors.h | 4 ++--
arch/arm64/include/asm/el2_setup.h | 2 +-
arch/arm64/include/asm/elf.h | 4 ++--
arch/arm64/include/asm/esr.h | 4 ++--
arch/arm64/include/asm/fixmap.h | 4 ++--
arch/arm64/include/asm/fpsimd.h | 2 +-
arch/arm64/include/asm/ftrace.h | 6 +++---
arch/arm64/include/asm/gpr-num.h | 6 +++---
arch/arm64/include/asm/hwcap.h | 2 +-
arch/arm64/include/asm/image.h | 4 ++--
arch/arm64/include/asm/insn.h | 4 ++--
arch/arm64/include/asm/jump_label.h | 4 ++--
arch/arm64/include/asm/kasan.h | 2 +-
arch/arm64/include/asm/kexec.h | 4 ++--
arch/arm64/include/asm/kgdb.h | 4 ++--
arch/arm64/include/asm/kvm_asm.h | 4 ++--
arch/arm64/include/asm/kvm_mmu.h | 4 ++--
arch/arm64/include/asm/kvm_mte.h | 4 ++--
arch/arm64/include/asm/kvm_ptrauth.h | 6 +++---
arch/arm64/include/asm/linkage.h | 2 +-
arch/arm64/include/asm/memory.h | 4 ++--
arch/arm64/include/asm/mmu.h | 4 ++--
arch/arm64/include/asm/mmu_context.h | 4 ++--
arch/arm64/include/asm/mte-kasan.h | 4 ++--
arch/arm64/include/asm/mte.h | 4 ++--
arch/arm64/include/asm/page.h | 4 ++--
arch/arm64/include/asm/pgtable-prot.h | 4 ++--
arch/arm64/include/asm/pgtable.h | 4 ++--
arch/arm64/include/asm/proc-fns.h | 4 ++--
arch/arm64/include/asm/processor.h | 4 ++--
arch/arm64/include/asm/ptrace.h | 4 ++--
arch/arm64/include/asm/rsi_smc.h | 4 ++--
arch/arm64/include/asm/rwonce.h | 4 ++--
arch/arm64/include/asm/scs.h | 4 ++--
arch/arm64/include/asm/sdei.h | 4 ++--
arch/arm64/include/asm/smp.h | 4 ++--
arch/arm64/include/asm/spectre.h | 4 ++--
arch/arm64/include/asm/stacktrace/frame.h | 4 ++--
arch/arm64/include/asm/sysreg.h | 10 +++++-----
arch/arm64/include/asm/system_misc.h | 4 ++--
arch/arm64/include/asm/thread_info.h | 2 +-
arch/arm64/include/asm/tlbflush.h | 2 +-
arch/arm64/include/asm/vdso.h | 4 ++--
arch/arm64/include/asm/vdso/compat_barrier.h | 4 ++--
arch/arm64/include/asm/vdso/compat_gettimeofday.h | 4 ++--
arch/arm64/include/asm/vdso/getrandom.h | 4 ++--
arch/arm64/include/asm/vdso/gettimeofday.h | 4 ++--
arch/arm64/include/asm/vdso/processor.h | 4 ++--
arch/arm64/include/asm/vdso/vsyscall.h | 4 ++--
arch/arm64/include/asm/virt.h | 4 ++--
tools/arch/arm64/include/asm/cputype.h | 4 ++--
tools/arch/arm64/include/asm/esr.h | 4 ++--
tools/arch/arm64/include/asm/gpr-num.h | 6 +++---
tools/arch/arm64/include/asm/sysreg.h | 10 +++++-----
tools/arch/arm64/include/uapi/asm/kvm.h | 2 +-
66 files changed, 136 insertions(+), 136 deletions(-)
diff --git a/arch/arm64/include/asm/alternative-macros.h b/arch/arm64/include/asm/alternative-macros.h
index c8c77f9e36d60..8624166248528 100644
--- a/arch/arm64/include/asm/alternative-macros.h
+++ b/arch/arm64/include/asm/alternative-macros.h
@@ -19,7 +19,7 @@
#error "cpucaps have overflown ARM64_CB_BIT"
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
@@ -207,7 +207,7 @@ alternative_endif
#define _ALTERNATIVE_CFG(insn1, insn2, cap, cfg, ...) \
alternative_insn insn1, insn2, cap, IS_ENABLED(cfg)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Usage: asm(ALTERNATIVE(oldinstr, newinstr, cpucap));
@@ -219,7 +219,7 @@ alternative_endif
#define ALTERNATIVE(oldinstr, newinstr, ...) \
_ALTERNATIVE_CFG(oldinstr, newinstr, __VA_ARGS__, 1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -263,6 +263,6 @@ alternative_has_cap_unlikely(const unsigned long cpucap)
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ALTERNATIVE_MACROS_H */
diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h
index 00d97b8a757f4..607a21e7dd9ce 100644
--- a/arch/arm64/include/asm/alternative.h
+++ b/arch/arm64/include/asm/alternative.h
@@ -4,7 +4,7 @@
#include <asm/alternative-macros.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/types.h>
@@ -34,5 +34,5 @@ static inline void apply_alternatives_module(void *start, size_t length) { }
void alt_cb_patch_nops(struct alt_instr *alt, __le32 *origptr,
__le32 *updptr, int nr_inst);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ALTERNATIVE_H */
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h
index 9e96f024b2f19..d20b03931a8d1 100644
--- a/arch/arm64/include/asm/arch_gicv3.h
+++ b/arch/arm64/include/asm/arch_gicv3.h
@@ -9,7 +9,7 @@
#include <asm/sysreg.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/irqchip/arm-gic-common.h>
#include <linux/stringify.h>
@@ -188,5 +188,5 @@ static inline bool gic_has_relaxed_pmr_sync(void)
return cpus_have_cap(ARM64_HAS_GIC_PRIO_RELAXED_SYNC);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ARCH_GICV3_H */
diff --git a/arch/arm64/include/asm/asm-extable.h b/arch/arm64/include/asm/asm-extable.h
index b8a5861dc7b77..98f3936352977 100644
--- a/arch/arm64/include/asm/asm-extable.h
+++ b/arch/arm64/include/asm/asm-extable.h
@@ -23,7 +23,7 @@
#define EX_DATA_REG_ADDR_SHIFT 5
#define EX_DATA_REG_ADDR GENMASK(9, 5)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
.pushsection __ex_table, "a"; \
@@ -69,7 +69,7 @@
.endif
.endm
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#include <linux/stringify.h>
@@ -124,6 +124,6 @@
EX_DATA_REG(ADDR, addr) \
")")
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ASM_EXTABLE_H */
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index ad63457a05c5b..cb644585049dd 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -5,7 +5,7 @@
* Copyright (C) 1996-2000 Russell King
* Copyright (C) 2012 ARM Ltd.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#error "Only include this from assembly code"
#endif
diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
index 1ca947d5c9396..0b188ae7b62de 100644
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@ -7,7 +7,7 @@
#ifndef __ASM_BARRIER_H
#define __ASM_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kasan-checks.h>
@@ -218,6 +218,6 @@ do { \
#include <asm-generic/barrier.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_BARRIER_H */
diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h
index 06a4670bdb0b9..a48050248c52a 100644
--- a/arch/arm64/include/asm/cache.h
+++ b/arch/arm64/include/asm/cache.h
@@ -35,7 +35,7 @@
#define ARCH_DMA_MINALIGN (128)
#define ARCH_KMALLOC_MINALIGN (8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitops.h>
#include <linux/kasan-enabled.h>
@@ -118,6 +118,6 @@ static inline u32 __attribute_const__ read_cpuid_effective_cachetype(void)
return ctr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
index 0b5ca6e0eb093..440ed52887e84 100644
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -5,7 +5,7 @@
#include <asm/cpucap-defs.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
/*
* Check whether a cpucap is possible at compiletime.
@@ -75,6 +75,6 @@ cpucap_is_possible(const unsigned int cap)
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_CPUCAPS_H */
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index e0e4478f5fb52..63df34f189d03 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -19,7 +19,7 @@
#define ARM64_SW_FEATURE_OVERRIDE_HVHE 4
#define ARM64_SW_FEATURE_OVERRIDE_RODATA_OFF 8
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <linux/jump_label.h>
@@ -1066,6 +1066,6 @@ static inline bool cpu_has_lpa2(void)
#endif
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
index 6f3f4142e214f..f9d5f025d8315 100644
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@ -225,7 +225,7 @@
#define MIDR_FUJITSU_ERRATUM_010001_MASK (~MIDR_CPU_VAR_REV(1, 0))
#define TCR_CLEAR_FUJITSU_ERRATUM_010001 (TCR_NFD1 | TCR_NFD0)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/sysreg.h>
@@ -310,6 +310,6 @@ static inline u32 __attribute_const__ read_cpuid_cachetype(void)
{
return read_cpuid(CTR_EL0);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/current.h b/arch/arm64/include/asm/current.h
index 54ceae0874c7e..c92912eaf1868 100644
--- a/arch/arm64/include/asm/current.h
+++ b/arch/arm64/include/asm/current.h
@@ -4,7 +4,7 @@
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
@@ -23,7 +23,7 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_CURRENT_H */
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
index 8f6ba31b86582..28d250be1b8d1 100644
--- a/arch/arm64/include/asm/debug-monitors.h
+++ b/arch/arm64/include/asm/debug-monitors.h
@@ -54,7 +54,7 @@
#define AARCH32_BREAK_THUMB2_LO 0xf7f0
#define AARCH32_BREAK_THUMB2_HI 0xa000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
#define DBG_ARCH_ID_RESERVED 0 /* In case of ptrace ABI updates. */
@@ -120,5 +120,5 @@ int aarch32_break_handler(struct pt_regs *regs);
void debug_traps_init(void);
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_DEBUG_MONITORS_H */
diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
index 555c613fd2324..ec90861bc8612 100644
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@ -7,7 +7,7 @@
#ifndef __ARM_KVM_INIT_H__
#define __ARM_KVM_INIT_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#error Assembly-only header
#endif
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 3f93f4eef9530..d2779d604c7be 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -133,7 +133,7 @@
#define ELF_ET_DYN_BASE (2 * DEFAULT_MAP_WINDOW_64 / 3)
#endif /* CONFIG_ARM64_FORCE_52BIT */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/linux/elf.h>
#include <linux/bug.h>
@@ -293,6 +293,6 @@ static inline int arch_check_elf(void *ehdr, bool has_interp,
return 0;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
index d1b1a33f9a8b0..7ded03ec90813 100644
--- a/arch/arm64/include/asm/esr.h
+++ b/arch/arm64/include/asm/esr.h
@@ -412,7 +412,7 @@
#define ESR_ELx_IT_GCSPOPCX 6
#define ESR_ELx_IT_GCSPOPX 7
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/types.h>
static inline unsigned long esr_brk_comment(unsigned long esr)
@@ -477,6 +477,6 @@ static inline bool esr_iss_is_eretab(unsigned long esr)
}
const char *esr_get_class_string(unsigned long esr);
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ESR_H */
diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h
index 87e307804b99c..d6c85783fed37 100644
--- a/arch/arm64/include/asm/fixmap.h
+++ b/arch/arm64/include/asm/fixmap.h
@@ -15,7 +15,7 @@
#ifndef _ASM_ARM64_FIXMAP_H
#define _ASM_ARM64_FIXMAP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kernel.h>
#include <linux/math.h>
#include <linux/sizes.h>
@@ -111,5 +111,5 @@ extern void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t pr
#include <asm-generic/fixmap.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_ARM64_FIXMAP_H */
diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h
index f2a84efc36185..5a092accf97d7 100644
--- a/arch/arm64/include/asm/fpsimd.h
+++ b/arch/arm64/include/asm/fpsimd.h
@@ -11,7 +11,7 @@
#include <asm/sigcontext.h>
#include <asm/sysreg.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitmap.h>
#include <linux/build_bug.h>
diff --git a/arch/arm64/include/asm/ftrace.h b/arch/arm64/include/asm/ftrace.h
index bfe3ce9df1978..42f04f91f74dd 100644
--- a/arch/arm64/include/asm/ftrace.h
+++ b/arch/arm64/include/asm/ftrace.h
@@ -37,7 +37,7 @@
*/
#define ARCH_FTRACE_SHIFT_STACK_TRACER 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compat.h>
extern void _mcount(unsigned long);
@@ -216,9 +216,9 @@ static inline bool arch_syscall_match_sym_name(const char *sym,
*/
return !strcmp(sym + 8, name);
}
-#endif /* ifndef __ASSEMBLY__ */
+#endif /* ifndef __ASSEMBLER__ */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
diff --git a/arch/arm64/include/asm/gpr-num.h b/arch/arm64/include/asm/gpr-num.h
index 05da4a7c5788f..a114e4f8209b0 100644
--- a/arch/arm64/include/asm/gpr-num.h
+++ b/arch/arm64/include/asm/gpr-num.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GPR_NUM_H
#define __ASM_GPR_NUM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.irp num,0,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
.equ .L__gpr_num_x\num, \num
@@ -11,7 +11,7 @@
.equ .L__gpr_num_xzr, 31
.equ .L__gpr_num_wzr, 31
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define __DEFINE_ASM_GPR_NUMS \
" .irp num,0,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\n" \
@@ -21,6 +21,6 @@
" .equ .L__gpr_num_xzr, 31\n" \
" .equ .L__gpr_num_wzr, 31\n"
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GPR_NUM_H */
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 1c3f9617d54fe..b10da333b95e2 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -46,7 +46,7 @@
#define COMPAT_HWCAP2_SB (1 << 5)
#define COMPAT_HWCAP2_SSBS (1 << 6)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/log2.h>
/*
diff --git a/arch/arm64/include/asm/image.h b/arch/arm64/include/asm/image.h
index c09cf942dc92e..9ba85173f8576 100644
--- a/arch/arm64/include/asm/image.h
+++ b/arch/arm64/include/asm/image.h
@@ -20,7 +20,7 @@
#define ARM64_IMAGE_FLAG_PAGE_SIZE_64K 3
#define ARM64_IMAGE_FLAG_PHYS_BASE 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define arm64_image_flag_field(flags, field) \
(((flags) >> field##_SHIFT) & field##_MASK)
@@ -54,6 +54,6 @@ struct arm64_image_header {
__le32 res5;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_IMAGE_H */
diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h
index e390c432f546e..765cc37609ab8 100644
--- a/arch/arm64/include/asm/insn.h
+++ b/arch/arm64/include/asm/insn.h
@@ -12,7 +12,7 @@
#include <asm/insn-def.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum aarch64_insn_hint_cr_op {
AARCH64_INSN_HINT_NOP = 0x0 << 5,
@@ -721,6 +721,6 @@ u32 aarch32_insn_mcr_extract_crm(u32 insn);
typedef bool (pstate_check_t)(unsigned long);
extern pstate_check_t * const aarch32_opcode_cond_checks[16];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_INSN_H */
diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h
index 424ed421cd979..0cb211d3607d3 100644
--- a/arch/arm64/include/asm/jump_label.h
+++ b/arch/arm64/include/asm/jump_label.h
@@ -8,7 +8,7 @@
#ifndef __ASM_JUMP_LABEL_H
#define __ASM_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/insn.h>
@@ -58,5 +58,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_JUMP_LABEL_H */
diff --git a/arch/arm64/include/asm/kasan.h b/arch/arm64/include/asm/kasan.h
index e1b57c13f8a41..b167e9d3da910 100644
--- a/arch/arm64/include/asm/kasan.h
+++ b/arch/arm64/include/asm/kasan.h
@@ -2,7 +2,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
#include <asm/memory.h>
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index 4d9cc7a76d9ca..892e5bebda957 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -25,7 +25,7 @@
#define KEXEC_ARCH KEXEC_ARCH_AARCH64
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* crash_setup_regs() - save registers for the panic kernel
@@ -130,6 +130,6 @@ extern int load_other_segments(struct kimage *image,
char *cmdline);
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/kgdb.h b/arch/arm64/include/asm/kgdb.h
index 21fc85e9d2bed..201d43fee673c 100644
--- a/arch/arm64/include/asm/kgdb.h
+++ b/arch/arm64/include/asm/kgdb.h
@@ -14,7 +14,7 @@
#include <linux/ptrace.h>
#include <asm/debug-monitors.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void arch_kgdb_breakpoint(void)
{
@@ -24,7 +24,7 @@ static inline void arch_kgdb_breakpoint(void)
extern void kgdb_handle_bus_error(void);
extern int kgdb_fault_expected;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* gdb remote procotol (well most versions of it) expects the following
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
index bec227f9500a0..2ea508492ef00 100644
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@ -46,7 +46,7 @@
#define __KVM_HOST_SMCCC_FUNC___kvm_hyp_init 0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mm.h>
@@ -301,7 +301,7 @@ void kvm_compute_final_ctr_el0(struct alt_instr *alt,
void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, u64 elr_virt,
u64 elr_phys, u64 par, uintptr_t vcpu, u64 far, u64 hpfar);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
.macro get_host_ctxt reg, tmp
adr_this_cpu \reg, kvm_host_data, \tmp
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
index b98ac6aa631f4..e0f4735933e5a 100644
--- a/arch/arm64/include/asm/kvm_mmu.h
+++ b/arch/arm64/include/asm/kvm_mmu.h
@@ -49,7 +49,7 @@
* mappings, and none of this applies in that case.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/alternative.h>
@@ -377,5 +377,5 @@ void kvm_s2_ptdump_create_debugfs(struct kvm *kvm);
static inline void kvm_s2_ptdump_create_debugfs(struct kvm *kvm) {}
#endif /* CONFIG_PTDUMP_STAGE2_DEBUGFS */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ARM64_KVM_MMU_H__ */
diff --git a/arch/arm64/include/asm/kvm_mte.h b/arch/arm64/include/asm/kvm_mte.h
index de002636eb1fb..3171963ad25ce 100644
--- a/arch/arm64/include/asm/kvm_mte.h
+++ b/arch/arm64/include/asm/kvm_mte.h
@@ -5,7 +5,7 @@
#ifndef __ASM_KVM_MTE_H
#define __ASM_KVM_MTE_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/sysreg.h>
@@ -62,5 +62,5 @@ alternative_else_nop_endif
.endm
#endif /* CONFIG_ARM64_MTE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_KVM_MTE_H */
diff --git a/arch/arm64/include/asm/kvm_ptrauth.h b/arch/arm64/include/asm/kvm_ptrauth.h
index 6199c9f7ec6ed..e50987b32483b 100644
--- a/arch/arm64/include/asm/kvm_ptrauth.h
+++ b/arch/arm64/include/asm/kvm_ptrauth.h
@@ -8,7 +8,7 @@
#ifndef __ASM_KVM_PTRAUTH_H
#define __ASM_KVM_PTRAUTH_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/sysreg.h>
@@ -100,7 +100,7 @@ alternative_else_nop_endif
.endm
#endif /* CONFIG_ARM64_PTR_AUTH */
-#else /* !__ASSEMBLY */
+#else /* !__ASSEMBLER__ */
#define __ptrauth_save_key(ctxt, key) \
do { \
@@ -120,5 +120,5 @@ alternative_else_nop_endif
__ptrauth_save_key(ctxt, APGA); \
} while(0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_KVM_PTRAUTH_H */
diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h
index d3acd9c875091..40bd17add5397 100644
--- a/arch/arm64/include/asm/linkage.h
+++ b/arch/arm64/include/asm/linkage.h
@@ -1,7 +1,7 @@
#ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/assembler.h>
#endif
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 717829df294ea..4db4f1737d9d2 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -211,7 +211,7 @@
*/
#define TRAMP_SWAPPER_OFFSET (2 * PAGE_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitops.h>
#include <linux/compiler.h>
@@ -425,7 +425,7 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
})
void dump_mem_limit(void);
-#endif /* !ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
/*
* Given that the GIC architecture permits ITS implementations that can only be
diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h
index 662471cfc5369..20e26b855ebcf 100644
--- a/arch/arm64/include/asm/mmu.h
+++ b/arch/arm64/include/asm/mmu.h
@@ -12,7 +12,7 @@
#define USER_ASID_FLAG (UL(1) << USER_ASID_BIT)
#define TTBR_ASID_MASK (UL(0xffff) << 48)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/refcount.h>
#include <asm/cpufeature.h>
@@ -109,5 +109,5 @@ static inline bool kaslr_requires_kpti(void)
return true;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h
index 0dbe3b29049b7..b4b361a4ec62c 100644
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
@@ -8,7 +8,7 @@
#ifndef __ASM_MMU_CONTEXT_H
#define __ASM_MMU_CONTEXT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/sched.h>
@@ -330,6 +330,6 @@ static inline void deactivate_mm(struct task_struct *tsk,
#include <asm-generic/mmu_context.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !__ASM_MMU_CONTEXT_H */
diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h
index 2e98028c19658..f9d69fe0516e9 100644
--- a/arch/arm64/include/asm/mte-kasan.h
+++ b/arch/arm64/include/asm/mte-kasan.h
@@ -9,7 +9,7 @@
#include <asm/cputype.h>
#include <asm/mte-def.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -253,6 +253,6 @@ static inline void mte_enable_kernel_asymm(void)
#endif /* CONFIG_ARM64_MTE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_MTE_KASAN_H */
diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h
index 6567df8ec8ca8..d9ee5c25010e8 100644
--- a/arch/arm64/include/asm/mte.h
+++ b/arch/arm64/include/asm/mte.h
@@ -8,7 +8,7 @@
#include <asm/compiler.h>
#include <asm/mte-def.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitfield.h>
#include <linux/kasan-enabled.h>
@@ -282,5 +282,5 @@ static inline void mte_check_tfsr_exit(void)
}
#endif /* CONFIG_KASAN_HW_TAGS */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_MTE_H */
diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
index 2312e6ee595fd..0370a1534abc0 100644
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@ -10,7 +10,7 @@
#include <asm/page-def.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/personality.h> /* for READ_IMPLIES_EXEC */
#include <linux/types.h> /* for gfp_t */
@@ -45,7 +45,7 @@ int pfn_is_map_memory(unsigned long pfn);
#include <asm/memory.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define VM_DATA_DEFAULT_FLAGS (VM_DATA_FLAGS_TSK_EXEC | VM_MTE_ALLOWED)
diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h
index a95f1f77bb39a..399c215ed3c5f 100644
--- a/arch/arm64/include/asm/pgtable-prot.h
+++ b/arch/arm64/include/asm/pgtable-prot.h
@@ -63,7 +63,7 @@
#define _PAGE_READONLY_EXEC (_PAGE_DEFAULT | PTE_USER | PTE_RDONLY | PTE_NG | PTE_PXN)
#define _PAGE_EXECONLY (_PAGE_DEFAULT | PTE_RDONLY | PTE_NG | PTE_PXN)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cpufeature.h>
#include <asm/pgtable-types.h>
@@ -128,7 +128,7 @@ static inline bool __pure lpa2_is_enabled(void)
#define PAGE_READONLY_EXEC __pgprot(_PAGE_READONLY_EXEC)
#define PAGE_EXECONLY __pgprot(_PAGE_EXECONLY)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define pte_pi_index(pte) ( \
((pte & BIT(PTE_PI_IDX_3)) >> (PTE_PI_IDX_3 - 3)) | \
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index 0b2a2ad1b9e83..b1810bdaf05a8 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -30,7 +30,7 @@
#define vmemmap ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cmpxchg.h>
#include <asm/fixmap.h>
@@ -1825,6 +1825,6 @@ static inline void clear_young_dirty_ptes(struct vm_area_struct *vma,
#endif /* CONFIG_ARM64_CONTPTE */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_PGTABLE_H */
diff --git a/arch/arm64/include/asm/proc-fns.h b/arch/arm64/include/asm/proc-fns.h
index 0d5d1f0525eb3..ab78a78821a2d 100644
--- a/arch/arm64/include/asm/proc-fns.h
+++ b/arch/arm64/include/asm/proc-fns.h
@@ -9,7 +9,7 @@
#ifndef __ASM_PROCFNS_H
#define __ASM_PROCFNS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/page.h>
@@ -21,5 +21,5 @@ extern u64 cpu_do_resume(phys_addr_t ptr, u64 idmap_ttbr);
#include <asm/memory.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_PROCFNS_H */
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index 1bf1a3b16e886..049a8bbdfd130 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -23,7 +23,7 @@
#define MTE_CTRL_TCF_ASYNC (1UL << 17)
#define MTE_CTRL_TCF_ASYMM (1UL << 18)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/build_bug.h>
#include <linux/cache.h>
@@ -435,5 +435,5 @@ int set_tsc_mode(unsigned int val);
#define GET_TSC_CTL(adr) get_tsc_mode((adr))
#define SET_TSC_CTL(val) set_tsc_mode((val))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_PROCESSOR_H */
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
index 47ff8654c5ec1..d4242221b99e7 100644
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -94,7 +94,7 @@
*/
#define NO_SYSCALL (-1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <linux/types.h>
@@ -364,5 +364,5 @@ static inline void procedure_link_pointer_set(struct pt_regs *regs,
extern unsigned long profile_pc(struct pt_regs *regs);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/arm64/include/asm/rsi_smc.h b/arch/arm64/include/asm/rsi_smc.h
index 6cb070eca9e9b..e19253f96c940 100644
--- a/arch/arm64/include/asm/rsi_smc.h
+++ b/arch/arm64/include/asm/rsi_smc.h
@@ -122,7 +122,7 @@
*/
#define SMC_RSI_ATTESTATION_TOKEN_CONTINUE SMC_RSI_FID(0x195)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct realm_config {
union {
@@ -142,7 +142,7 @@ struct realm_config {
*/
} __aligned(0x1000);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Read configuration for the current Realm.
diff --git a/arch/arm64/include/asm/rwonce.h b/arch/arm64/include/asm/rwonce.h
index 56f7b1d4d54b9..9760dda9c236d 100644
--- a/arch/arm64/include/asm/rwonce.h
+++ b/arch/arm64/include/asm/rwonce.h
@@ -5,7 +5,7 @@
#ifndef __ASM_RWONCE_H
#define __ASM_RWONCE_H
-#if defined(CONFIG_LTO) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_LTO) && !defined(__ASSEMBLER__)
#include <linux/compiler_types.h>
#include <asm/alternative-macros.h>
@@ -66,7 +66,7 @@
})
#endif /* !BUILD_VDSO */
-#endif /* CONFIG_LTO && !__ASSEMBLY__ */
+#endif /* CONFIG_LTO && !__ASSEMBLER__ */
#include <asm-generic/rwonce.h>
diff --git a/arch/arm64/include/asm/scs.h b/arch/arm64/include/asm/scs.h
index a76f9b387a269..d31b128f683f6 100644
--- a/arch/arm64/include/asm/scs.h
+++ b/arch/arm64/include/asm/scs.h
@@ -2,7 +2,7 @@
#ifndef _ASM_SCS_H
#define _ASM_SCS_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#include <asm/sysreg.h>
@@ -55,6 +55,6 @@ enum {
int __pi_scs_patch(const u8 eh_frame[], int size);
-#endif /* __ASSEMBLY __ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_SCS_H */
diff --git a/arch/arm64/include/asm/sdei.h b/arch/arm64/include/asm/sdei.h
index 484cb6972e99a..b2248bd3cb58f 100644
--- a/arch/arm64/include/asm/sdei.h
+++ b/arch/arm64/include/asm/sdei.h
@@ -9,7 +9,7 @@
#define SDEI_STACK_SIZE IRQ_STACK_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
#include <linux/preempt.h>
@@ -49,5 +49,5 @@ unsigned long do_sdei_event(struct pt_regs *regs,
unsigned long sdei_arch_get_entry_point(int conduit);
#define sdei_arch_get_entry_point(x) sdei_arch_get_entry_point(x)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_SDEI_H */
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
index 2510eec026f7e..85fbe02b3b9f8 100644
--- a/arch/arm64/include/asm/smp.h
+++ b/arch/arm64/include/asm/smp.h
@@ -23,7 +23,7 @@
#define CPU_STUCK_REASON_52_BIT_VA (UL(1) << CPU_STUCK_REASON_SHIFT)
#define CPU_STUCK_REASON_NO_GRAN (UL(2) << CPU_STUCK_REASON_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/threads.h>
#include <linux/cpumask.h>
@@ -133,6 +133,6 @@ bool cpus_are_stuck_in_kernel(void);
extern void crash_smp_send_stop(void);
extern bool smp_crash_stop_failed(void);
-#endif /* ifndef __ASSEMBLY__ */
+#endif /* ifndef __ASSEMBLER__ */
#endif /* ifndef __ASM_SMP_H */
diff --git a/arch/arm64/include/asm/spectre.h b/arch/arm64/include/asm/spectre.h
index 0c4d9045c31f4..85941e4742a27 100644
--- a/arch/arm64/include/asm/spectre.h
+++ b/arch/arm64/include/asm/spectre.h
@@ -12,7 +12,7 @@
#define BP_HARDEN_EL2_SLOTS 4
#define __BP_HARDEN_HYP_VECS_SZ ((BP_HARDEN_EL2_SLOTS - 1) * SZ_2K)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/smp.h>
#include <asm/percpu.h>
@@ -116,5 +116,5 @@ void spectre_bhb_patch_wa3(struct alt_instr *alt,
void spectre_bhb_patch_clearbhb(struct alt_instr *alt,
__le32 *origptr, __le32 *updptr, int nr_inst);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_SPECTRE_H */
diff --git a/arch/arm64/include/asm/stacktrace/frame.h b/arch/arm64/include/asm/stacktrace/frame.h
index 0ee0f6ba0fd86..796797b8db7e5 100644
--- a/arch/arm64/include/asm/stacktrace/frame.h
+++ b/arch/arm64/include/asm/stacktrace/frame.h
@@ -25,7 +25,7 @@
#define FRAME_META_TYPE_FINAL 1
#define FRAME_META_TYPE_PT_REGS 2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* A standard AAPCS64 frame record.
*/
@@ -43,6 +43,6 @@ struct frame_record_meta {
struct frame_record record;
u64 type;
};
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_STACKTRACE_FRAME_H */
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 05ea5223d2d55..ac659b6f90d02 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -51,7 +51,7 @@
#ifndef CONFIG_BROKEN_GAS_INST
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
// The space separator is omitted so that __emit_inst(x) can be parsed as
// either an assembler directive or an assembler macro argument.
#define __emit_inst(x) .inst(x)
@@ -70,11 +70,11 @@
(((x) >> 24) & 0x000000ff))
#endif /* CONFIG_CPU_BIG_ENDIAN */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __emit_inst(x) .long __INSTR_BSWAP(x)
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define __emit_inst(x) ".long " __stringify(__INSTR_BSWAP(x)) "\n\t"
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_BROKEN_GAS_INST */
@@ -1106,7 +1106,7 @@
/* Defined for compatibility only, do not add new users. */
#define ARM64_FEATURE_MASK(x) (x##_MASK)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro mrs_s, rt, sreg
__emit_inst(0xd5200000|(\sreg)|(.L__gpr_num_\rt))
diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h
index c343442567625..a557160c96365 100644
--- a/arch/arm64/include/asm/system_misc.h
+++ b/arch/arm64/include/asm/system_misc.h
@@ -7,7 +7,7 @@
#ifndef __ASM_SYSTEM_MISC_H
#define __ASM_SYSTEM_MISC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/linkage.h>
@@ -32,6 +32,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned long,
struct mm_struct;
extern void __show_regs(struct pt_regs *);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_SYSTEM_MISC_H */
diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
index 1114c1c3300a1..60d764610b145 100644
--- a/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@@ -10,7 +10,7 @@
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h
index bc94e036a26b9..cf40c428aba19 100644
--- a/arch/arm64/include/asm/tlbflush.h
+++ b/arch/arm64/include/asm/tlbflush.h
@@ -8,7 +8,7 @@
#ifndef __ASM_TLBFLUSH_H
#define __ASM_TLBFLUSH_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bitfield.h>
#include <linux/mm_types.h>
diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h
index 3e3c3fdb18427..2e56188d3f54a 100644
--- a/arch/arm64/include/asm/vdso.h
+++ b/arch/arm64/include/asm/vdso.h
@@ -7,7 +7,7 @@
#define __VVAR_PAGES 2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <generated/vdso-offsets.h>
@@ -19,6 +19,6 @@
extern char vdso_start[], vdso_end[];
extern char vdso32_start[], vdso32_end[];
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_H */
diff --git a/arch/arm64/include/asm/vdso/compat_barrier.h b/arch/arm64/include/asm/vdso/compat_barrier.h
index 3ac35f4a667cf..68a50fc1d830a 100644
--- a/arch/arm64/include/asm/vdso/compat_barrier.h
+++ b/arch/arm64/include/asm/vdso/compat_barrier.h
@@ -5,7 +5,7 @@
#ifndef __COMPAT_BARRIER_H
#define __COMPAT_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Warning: This code is meant to be used with
* ENABLE_COMPAT_VDSO only.
@@ -32,6 +32,6 @@
#define smp_rmb() aarch32_smp_rmb()
#define smp_wmb() aarch32_smp_wmb()
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __COMPAT_BARRIER_H */
diff --git a/arch/arm64/include/asm/vdso/compat_gettimeofday.h b/arch/arm64/include/asm/vdso/compat_gettimeofday.h
index 778c1202bbbf9..626ea7f5a54a9 100644
--- a/arch/arm64/include/asm/vdso/compat_gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/compat_gettimeofday.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <asm/unistd_compat_32.h>
@@ -173,6 +173,6 @@ static inline bool vdso_clocksource_ok(const struct vdso_data *vd)
}
#define vdso_clocksource_ok vdso_clocksource_ok
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/arm64/include/asm/vdso/getrandom.h b/arch/arm64/include/asm/vdso/getrandom.h
index 342f807e20444..197267a3d6b3c 100644
--- a/arch/arm64/include/asm/vdso/getrandom.h
+++ b/arch/arm64/include/asm/vdso/getrandom.h
@@ -3,7 +3,7 @@
#ifndef __ASM_VDSO_GETRANDOM_H
#define __ASM_VDSO_GETRANDOM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/unistd.h>
#include <asm/vdso/vsyscall.h>
@@ -45,6 +45,6 @@ static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void
return &_vdso_rng_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETRANDOM_H */
diff --git a/arch/arm64/include/asm/vdso/gettimeofday.h b/arch/arm64/include/asm/vdso/gettimeofday.h
index 764d13e2916c5..fa6f33e45673a 100644
--- a/arch/arm64/include/asm/vdso/gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/gettimeofday.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/alternative.h>
#include <asm/barrier.h>
@@ -113,6 +113,6 @@ const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd)
}
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/arm64/include/asm/vdso/processor.h b/arch/arm64/include/asm/vdso/processor.h
index ff830b766ad2d..7abb0cc81cd6e 100644
--- a/arch/arm64/include/asm/vdso/processor.h
+++ b/arch/arm64/include/asm/vdso/processor.h
@@ -5,13 +5,13 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void cpu_relax(void)
{
asm volatile("yield" ::: "memory");
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/arm64/include/asm/vdso/vsyscall.h b/arch/arm64/include/asm/vdso/vsyscall.h
index eea51946d45a2..9e37df010e498 100644
--- a/arch/arm64/include/asm/vdso/vsyscall.h
+++ b/arch/arm64/include/asm/vdso/vsyscall.h
@@ -4,7 +4,7 @@
#define __VDSO_RND_DATA_OFFSET 480
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
@@ -46,6 +46,6 @@ void __arm64_update_vsyscall(struct vdso_data *vdata)
/* 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 */
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
index ebf4a9f943ed9..ac72813a50fe2 100644
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@ -56,7 +56,7 @@
*/
#define BOOT_CPU_FLAG_E2H BIT_ULL(32)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
#include <asm/sections.h>
@@ -160,6 +160,6 @@ static inline bool is_hyp_nvhe(void)
return is_hyp_mode_available() && !is_kernel_in_hyp_mode();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* ! __ASM__VIRT_H */
diff --git a/tools/arch/arm64/include/asm/cputype.h b/tools/arch/arm64/include/asm/cputype.h
index 488f8e7513495..5e960f959f486 100644
--- a/tools/arch/arm64/include/asm/cputype.h
+++ b/tools/arch/arm64/include/asm/cputype.h
@@ -223,7 +223,7 @@
#define MIDR_FUJITSU_ERRATUM_010001_MASK (~MIDR_CPU_VAR_REV(1, 0))
#define TCR_CLEAR_FUJITSU_ERRATUM_010001 (TCR_NFD1 | TCR_NFD0)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/sysreg.h>
@@ -308,6 +308,6 @@ static inline u32 __attribute_const__ read_cpuid_cachetype(void)
{
return read_cpuid(CTR_EL0);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/tools/arch/arm64/include/asm/esr.h b/tools/arch/arm64/include/asm/esr.h
index bd592ca815711..bbfbd1497a2f8 100644
--- a/tools/arch/arm64/include/asm/esr.h
+++ b/tools/arch/arm64/include/asm/esr.h
@@ -385,7 +385,7 @@
#define ESR_ELx_MOPS_ISS_SRCREG(esr) (((esr) & (UL(0x1f) << 5)) >> 5)
#define ESR_ELx_MOPS_ISS_SIZEREG(esr) (((esr) & (UL(0x1f) << 0)) >> 0)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/types.h>
static inline unsigned long esr_brk_comment(unsigned long esr)
@@ -450,6 +450,6 @@ static inline bool esr_iss_is_eretab(unsigned long esr)
}
const char *esr_get_class_string(unsigned long esr);
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ESR_H */
diff --git a/tools/arch/arm64/include/asm/gpr-num.h b/tools/arch/arm64/include/asm/gpr-num.h
index 05da4a7c5788f..a114e4f8209b0 100644
--- a/tools/arch/arm64/include/asm/gpr-num.h
+++ b/tools/arch/arm64/include/asm/gpr-num.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GPR_NUM_H
#define __ASM_GPR_NUM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.irp num,0,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
.equ .L__gpr_num_x\num, \num
@@ -11,7 +11,7 @@
.equ .L__gpr_num_xzr, 31
.equ .L__gpr_num_wzr, 31
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define __DEFINE_ASM_GPR_NUMS \
" .irp num,0,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\n" \
@@ -21,6 +21,6 @@
" .equ .L__gpr_num_xzr, 31\n" \
" .equ .L__gpr_num_wzr, 31\n"
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GPR_NUM_H */
diff --git a/tools/arch/arm64/include/asm/sysreg.h b/tools/arch/arm64/include/asm/sysreg.h
index 150416682e2cb..d380d4fa0c271 100644
--- a/tools/arch/arm64/include/asm/sysreg.h
+++ b/tools/arch/arm64/include/asm/sysreg.h
@@ -51,7 +51,7 @@
#ifndef CONFIG_BROKEN_GAS_INST
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
// The space separator is omitted so that __emit_inst(x) can be parsed as
// either an assembler directive or an assembler macro argument.
#define __emit_inst(x) .inst(x)
@@ -70,11 +70,11 @@
(((x) >> 24) & 0x000000ff))
#endif /* CONFIG_CPU_BIG_ENDIAN */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __emit_inst(x) .long __INSTR_BSWAP(x)
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define __emit_inst(x) ".long " __stringify(__INSTR_BSWAP(x)) "\n\t"
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_BROKEN_GAS_INST */
@@ -1082,7 +1082,7 @@
/* Defined for compatibility only, do not add new users. */
#define ARM64_FEATURE_MASK(x) (x##_MASK)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro mrs_s, rt, sreg
__emit_inst(0xd5200000|(\sreg)|(.L__gpr_num_\rt))
diff --git a/tools/arch/arm64/include/uapi/asm/kvm.h b/tools/arch/arm64/include/uapi/asm/kvm.h
index 66736ff04011e..952eac708a828 100644
--- a/tools/arch/arm64/include/uapi/asm/kvm.h
+++ b/tools/arch/arm64/include/uapi/asm/kvm.h
@@ -31,7 +31,7 @@
#define KVM_SPSR_FIQ 4
#define KVM_NR_SPSR 5
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/psci.h>
#include <linux/types.h>
#include <asm/ptrace.h>
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 10/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi header
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (8 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 09/41] arm64: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (30 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Guo Ren, linux-csky
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Guo Ren <guoren@kernel.org>
Cc: linux-csky@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/csky/include/uapi/asm/ptrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/csky/include/uapi/asm/ptrace.h b/arch/csky/include/uapi/asm/ptrace.h
index 3be9c14334a6e..90a5c36e4345d 100644
--- a/arch/csky/include/uapi/asm/ptrace.h
+++ b/arch/csky/include/uapi/asm/ptrace.h
@@ -3,7 +3,7 @@
#ifndef _CSKY_PTRACE_H
#define _CSKY_PTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pt_regs {
unsigned long tls;
@@ -47,5 +47,5 @@ struct user_fp {
unsigned long reserved;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _CSKY_PTRACE_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (9 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 10/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi header Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-06-05 18:28 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 12/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (29 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Guo Ren, linux-csky
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 */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-06-05 18:28 ` Thomas Huth
2025-06-06 2:23 ` Guo Ren
0 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-05 18:28 UTC (permalink / raw)
To: Guo Ren; +Cc: linux-csky
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
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-05 18:28 ` Thomas Huth
@ 2025-06-06 2:23 ` Guo Ren
2025-06-06 5:31 ` Thomas Huth
0 siblings, 1 reply; 94+ messages in thread
From: Guo Ren @ 2025-06-06 2:23 UTC (permalink / raw)
To: Thomas Huth; +Cc: linux-csky
On Fri, Jun 6, 2025 at 2:28 AM Thomas Huth <thuth@redhat.com> wrote:
>
> 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
>
How about riscv?
--
Best Regards
Guo Ren
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 2:23 ` Guo Ren
@ 2025-06-06 5:31 ` Thomas Huth
2025-06-06 7:20 ` Guo Ren
0 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-06 5:31 UTC (permalink / raw)
To: Guo Ren; +Cc: linux-csky
On 06/06/2025 04.23, Guo Ren wrote:
> On Fri, Jun 6, 2025 at 2:28 AM Thomas Huth <thuth@redhat.com> wrote:
>>
>> 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
>>
> How about riscv?
The riscv patch
(https://lore.kernel.org/all/20250314071013.1575167-30-thuth@redhat.com/)
needs a rebase since it does not apply cleanly anymore. I'll try to do that
in the next couple of days.
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 5:31 ` Thomas Huth
@ 2025-06-06 7:20 ` Guo Ren
2025-09-30 4:27 ` Thomas Huth
0 siblings, 1 reply; 94+ messages in thread
From: Guo Ren @ 2025-06-06 7:20 UTC (permalink / raw)
To: Thomas Huth; +Cc: linux-csky
On Fri, Jun 6, 2025 at 1:31 PM Thomas Huth <thuth@redhat.com> wrote:
>
> On 06/06/2025 04.23, Guo Ren wrote:
> > On Fri, Jun 6, 2025 at 2:28 AM Thomas Huth <thuth@redhat.com> wrote:
> >>
> >> 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
> >>
> > How about riscv?
>
> The riscv patch
> (https://lore.kernel.org/all/20250314071013.1575167-30-thuth@redhat.com/)
> needs a rebase since it does not apply cleanly anymore. I'll try to do that
> in the next couple of days.
Thanks for the info, I would take the patch after the other
architecture is approved. It's not a rush job.
>
> Thomas
>
--
Best Regards
Guo Ren
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 7:20 ` Guo Ren
@ 2025-09-30 4:27 ` Thomas Huth
2025-09-30 6:57 ` Guo Ren
0 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-09-30 4:27 UTC (permalink / raw)
To: Guo Ren; +Cc: linux-csky
On 06/06/2025 09.20, Guo Ren wrote:
> On Fri, Jun 6, 2025 at 1:31 PM Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 06/06/2025 04.23, Guo Ren wrote:
>>> On Fri, Jun 6, 2025 at 2:28 AM Thomas Huth <thuth@redhat.com> wrote:
>>>>
>>>> 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
>>>>
>>> How about riscv?
>>
>> The riscv patch
>> (https://lore.kernel.org/all/20250314071013.1575167-30-thuth@redhat.com/)
>> needs a rebase since it does not apply cleanly anymore. I'll try to do that
>> in the next couple of days.
> Thanks for the info, I would take the patch after the other
> architecture is approved. It's not a rush job.
The riscv patch has now been merged. Could you please pick up the csky patch
now?
Thanks,
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-09-30 4:27 ` Thomas Huth
@ 2025-09-30 6:57 ` Guo Ren
0 siblings, 0 replies; 94+ messages in thread
From: Guo Ren @ 2025-09-30 6:57 UTC (permalink / raw)
To: Thomas Huth; +Cc: linux-csky
On Tue, Sep 30, 2025 at 12:27 PM Thomas Huth <thuth@redhat.com> wrote:
>
> On 06/06/2025 09.20, Guo Ren wrote:
> > On Fri, Jun 6, 2025 at 1:31 PM Thomas Huth <thuth@redhat.com> wrote:
> >>
> >> On 06/06/2025 04.23, Guo Ren wrote:
> >>> On Fri, Jun 6, 2025 at 2:28 AM Thomas Huth <thuth@redhat.com> wrote:
> >>>>
> >>>> 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
> >>>>
> >>> How about riscv?
> >>
> >> The riscv patch
> >> (https://lore.kernel.org/all/20250314071013.1575167-30-thuth@redhat.com/)
> >> needs a rebase since it does not apply cleanly anymore. I'll try to do that
> >> in the next couple of days.
> > Thanks for the info, I would take the patch after the other
> > architecture is approved. It's not a rush job.
>
> The riscv patch has now been merged. Could you please pick up the csky patch
> now?
Yes, I'll review and pick it up.
--
Best Regards
Guo Ren
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 12/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (10 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 11/41] csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (28 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Brian Cain, linux-hexagon
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Brian Cain <brian.cain@oss.qualcomm.com>
Cc: linux-hexagon@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/hexagon/include/uapi/asm/registers.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/hexagon/include/uapi/asm/registers.h b/arch/hexagon/include/uapi/asm/registers.h
index d51270f3b3582..8f73d41651e87 100644
--- a/arch/hexagon/include/uapi/asm/registers.h
+++ b/arch/hexagon/include/uapi/asm/registers.h
@@ -7,7 +7,7 @@
#ifndef _ASM_REGISTERS_H
#define _ASM_REGISTERS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* See kernel/entry.S for further documentation. */
@@ -224,6 +224,6 @@ struct pt_regs {
(regs)->hvmer.vmest = (HVM_VMEST_UM_MSK << HVM_VMEST_UM_SFT) \
| (HVM_VMEST_IE_MSK << HVM_VMEST_IE_SFT)
-#endif /* ifndef __ASSEMBLY */
+#endif /* ifndef __ASSEMBLER__ */
#endif
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (11 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 12/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-04-08 15:16 ` Brian Cain
2025-03-14 7:09 ` [PATCH 14/41] loongarch: Replace __ASSEMBLY__ with __ASSEMBLER__ in the loongarch headers Thomas Huth
` (27 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Brian Cain, linux-hexagon
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: Brian Cain <brian.cain@oss.qualcomm.com>
Cc: linux-hexagon@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/hexagon/include/asm/hexagon_vm.h | 4 ++--
arch/hexagon/include/asm/mem-layout.h | 6 +++---
arch/hexagon/include/asm/page.h | 4 ++--
arch/hexagon/include/asm/processor.h | 4 ++--
arch/hexagon/include/asm/thread_info.h | 12 ++++++------
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/hexagon/include/asm/hexagon_vm.h b/arch/hexagon/include/asm/hexagon_vm.h
index 9aa2493fe7863..e1e702eb9e12a 100644
--- a/arch/hexagon/include/asm/hexagon_vm.h
+++ b/arch/hexagon/include/asm/hexagon_vm.h
@@ -39,7 +39,7 @@
#define HVM_TRAP1_VMGETREGS 22
#define HVM_TRAP1_VMTIMEROP 24
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum VM_CACHE_OPS {
hvmc_ickill,
@@ -178,7 +178,7 @@ static inline long __vmintop_clear(long i)
#else /* Only assembly code should reference these */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Constants for virtual instruction parameters and return values
diff --git a/arch/hexagon/include/asm/mem-layout.h b/arch/hexagon/include/asm/mem-layout.h
index e2f99413fe56e..8bad920d8928a 100644
--- a/arch/hexagon/include/asm/mem-layout.h
+++ b/arch/hexagon/include/asm/mem-layout.h
@@ -25,7 +25,7 @@
*/
#ifdef CONFIG_HEXAGON_PHYS_OFFSET
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long __phys_offset;
#endif
#define PHYS_OFFSET __phys_offset
@@ -44,7 +44,7 @@ extern unsigned long __phys_offset;
#define STACK_TOP TASK_SIZE
#define STACK_TOP_MAX TASK_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum fixed_addresses {
FIX_KMAP_BEGIN,
FIX_KMAP_END, /* check for per-cpuism */
@@ -101,7 +101,7 @@ extern int max_kernel_seg;
* and pkmap_base begins.
*/
#define VMALLOC_END (PKMAP_BASE-PAGE_SIZE*2)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_HEXAGON_MEM_LAYOUT_H */
diff --git a/arch/hexagon/include/asm/page.h b/arch/hexagon/include/asm/page.h
index 137ba7c5de481..7e651428a08c0 100644
--- a/arch/hexagon/include/asm/page.h
+++ b/arch/hexagon/include/asm/page.h
@@ -48,7 +48,7 @@
#include <vdso/page.h>
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This is for PFN_DOWN, which mm.h needs. Seems the right place to pull it in.
@@ -128,7 +128,7 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
/* XXX Todo: implement assembly-optimized version of getorder. */
#include <asm-generic/getorder.h>
-#endif /* ifdef __ASSEMBLY__ */
+#endif /* ifdef __ASSEMBLER__ */
#endif /* ifdef __KERNEL__ */
#endif
diff --git a/arch/hexagon/include/asm/processor.h b/arch/hexagon/include/asm/processor.h
index 0cd39c2cdf8f7..b93c2cc4be22e 100644
--- a/arch/hexagon/include/asm/processor.h
+++ b/arch/hexagon/include/asm/processor.h
@@ -8,7 +8,7 @@
#ifndef _ASM_PROCESSOR_H
#define _ASM_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/mem-layout.h>
#include <asm/registers.h>
@@ -124,6 +124,6 @@ struct hexagon_switch_stack {
unsigned long lr;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/hexagon/include/asm/thread_info.h b/arch/hexagon/include/asm/thread_info.h
index e90f280b9ce3e..a0da6c694c87b 100644
--- a/arch/hexagon/include/asm/thread_info.h
+++ b/arch/hexagon/include/asm/thread_info.h
@@ -10,7 +10,7 @@
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <asm/registers.h>
#include <asm/page.h>
@@ -20,7 +20,7 @@
#define THREAD_SIZE (1<<THREAD_SHIFT)
#define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This is union'd with the "bottom" of the kernel stack.
@@ -47,13 +47,13 @@ struct thread_info {
unsigned long sp;
};
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <asm/asm-offsets.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define INIT_THREAD_INFO(tsk) \
{ \
@@ -73,7 +73,7 @@ struct thread_info {
register struct thread_info *__current_thread_info asm(QUOTED_THREADINFO_REG);
#define current_thread_info() __current_thread_info
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* thread information flags
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-04-08 15:16 ` Brian Cain
2025-10-06 8:08 ` Thomas Huth
0 siblings, 1 reply; 94+ messages in thread
From: Brian Cain @ 2025-04-08 15:16 UTC (permalink / raw)
To: Thomas Huth, linux-kernel; +Cc: Arnd Bergmann, linux-arch, linux-hexagon
On 3/14/2025 2:09 AM, 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: Brian Cain <brian.cain@oss.qualcomm.com>
> Cc: linux-hexagon@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
Acked-by: Brian Cain <brian.cain@oss.qualcomm.com>
> arch/hexagon/include/asm/hexagon_vm.h | 4 ++--
> arch/hexagon/include/asm/mem-layout.h | 6 +++---
> arch/hexagon/include/asm/page.h | 4 ++--
> arch/hexagon/include/asm/processor.h | 4 ++--
> arch/hexagon/include/asm/thread_info.h | 12 ++++++------
> 5 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/arch/hexagon/include/asm/hexagon_vm.h b/arch/hexagon/include/asm/hexagon_vm.h
> index 9aa2493fe7863..e1e702eb9e12a 100644
> --- a/arch/hexagon/include/asm/hexagon_vm.h
> +++ b/arch/hexagon/include/asm/hexagon_vm.h
> @@ -39,7 +39,7 @@
> #define HVM_TRAP1_VMGETREGS 22
> #define HVM_TRAP1_VMTIMEROP 24
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> enum VM_CACHE_OPS {
> hvmc_ickill,
> @@ -178,7 +178,7 @@ static inline long __vmintop_clear(long i)
>
> #else /* Only assembly code should reference these */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * Constants for virtual instruction parameters and return values
> diff --git a/arch/hexagon/include/asm/mem-layout.h b/arch/hexagon/include/asm/mem-layout.h
> index e2f99413fe56e..8bad920d8928a 100644
> --- a/arch/hexagon/include/asm/mem-layout.h
> +++ b/arch/hexagon/include/asm/mem-layout.h
> @@ -25,7 +25,7 @@
> */
>
> #ifdef CONFIG_HEXAGON_PHYS_OFFSET
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long __phys_offset;
> #endif
> #define PHYS_OFFSET __phys_offset
> @@ -44,7 +44,7 @@ extern unsigned long __phys_offset;
> #define STACK_TOP TASK_SIZE
> #define STACK_TOP_MAX TASK_SIZE
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> enum fixed_addresses {
> FIX_KMAP_BEGIN,
> FIX_KMAP_END, /* check for per-cpuism */
> @@ -101,7 +101,7 @@ extern int max_kernel_seg;
> * and pkmap_base begins.
> */
> #define VMALLOC_END (PKMAP_BASE-PAGE_SIZE*2)
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
>
> #endif /* _ASM_HEXAGON_MEM_LAYOUT_H */
> diff --git a/arch/hexagon/include/asm/page.h b/arch/hexagon/include/asm/page.h
> index 137ba7c5de481..7e651428a08c0 100644
> --- a/arch/hexagon/include/asm/page.h
> +++ b/arch/hexagon/include/asm/page.h
> @@ -48,7 +48,7 @@
> #include <vdso/page.h>
>
> #ifdef __KERNEL__
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * This is for PFN_DOWN, which mm.h needs. Seems the right place to pull it in.
> @@ -128,7 +128,7 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
> /* XXX Todo: implement assembly-optimized version of getorder. */
> #include <asm-generic/getorder.h>
>
> -#endif /* ifdef __ASSEMBLY__ */
> +#endif /* ifdef __ASSEMBLER__ */
> #endif /* ifdef __KERNEL__ */
>
> #endif
> diff --git a/arch/hexagon/include/asm/processor.h b/arch/hexagon/include/asm/processor.h
> index 0cd39c2cdf8f7..b93c2cc4be22e 100644
> --- a/arch/hexagon/include/asm/processor.h
> +++ b/arch/hexagon/include/asm/processor.h
> @@ -8,7 +8,7 @@
> #ifndef _ASM_PROCESSOR_H
> #define _ASM_PROCESSOR_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/mem-layout.h>
> #include <asm/registers.h>
> @@ -124,6 +124,6 @@ struct hexagon_switch_stack {
> unsigned long lr;
> };
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif
> diff --git a/arch/hexagon/include/asm/thread_info.h b/arch/hexagon/include/asm/thread_info.h
> index e90f280b9ce3e..a0da6c694c87b 100644
> --- a/arch/hexagon/include/asm/thread_info.h
> +++ b/arch/hexagon/include/asm/thread_info.h
> @@ -10,7 +10,7 @@
>
> #ifdef __KERNEL__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/processor.h>
> #include <asm/registers.h>
> #include <asm/page.h>
> @@ -20,7 +20,7 @@
> #define THREAD_SIZE (1<<THREAD_SHIFT)
> #define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * This is union'd with the "bottom" of the kernel stack.
> @@ -47,13 +47,13 @@ struct thread_info {
> unsigned long sp;
> };
>
> -#else /* !__ASSEMBLY__ */
> +#else /* !__ASSEMBLER__ */
>
> #include <asm/asm-offsets.h>
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define INIT_THREAD_INFO(tsk) \
> { \
> @@ -73,7 +73,7 @@ struct thread_info {
> register struct thread_info *__current_thread_info asm(QUOTED_THREADINFO_REG);
> #define current_thread_info() __current_thread_info
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * thread information flags
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-04-08 15:16 ` Brian Cain
@ 2025-10-06 8:08 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-10-06 8:08 UTC (permalink / raw)
To: Brian Cain, linux-kernel; +Cc: linux-hexagon
On 08/04/2025 17.16, Brian Cain wrote:
>
> On 3/14/2025 2:09 AM, 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: Brian Cain <brian.cain@oss.qualcomm.com>
>> Cc: linux-hexagon@vger.kernel.org
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>
>
> Acked-by: Brian Cain <brian.cain@oss.qualcomm.com>
Hi Brian!
Could you please merge the two hexagon patches through the hexagon tree?
(most of the patches for the other architectures have also been picked up by
the respective architecture maintainers)
Thanks,
Thomas
>
>> arch/hexagon/include/asm/hexagon_vm.h | 4 ++--
>> arch/hexagon/include/asm/mem-layout.h | 6 +++---
>> arch/hexagon/include/asm/page.h | 4 ++--
>> arch/hexagon/include/asm/processor.h | 4 ++--
>> arch/hexagon/include/asm/thread_info.h | 12 ++++++------
>> 5 files changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/arch/hexagon/include/asm/hexagon_vm.h b/arch/hexagon/include/
>> asm/hexagon_vm.h
>> index 9aa2493fe7863..e1e702eb9e12a 100644
>> --- a/arch/hexagon/include/asm/hexagon_vm.h
>> +++ b/arch/hexagon/include/asm/hexagon_vm.h
>> @@ -39,7 +39,7 @@
>> #define HVM_TRAP1_VMGETREGS 22
>> #define HVM_TRAP1_VMTIMEROP 24
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> enum VM_CACHE_OPS {
>> hvmc_ickill,
>> @@ -178,7 +178,7 @@ static inline long __vmintop_clear(long i)
>> #else /* Only assembly code should reference these */
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> /*
>> * Constants for virtual instruction parameters and return values
>> diff --git a/arch/hexagon/include/asm/mem-layout.h b/arch/hexagon/include/
>> asm/mem-layout.h
>> index e2f99413fe56e..8bad920d8928a 100644
>> --- a/arch/hexagon/include/asm/mem-layout.h
>> +++ b/arch/hexagon/include/asm/mem-layout.h
>> @@ -25,7 +25,7 @@
>> */
>> #ifdef CONFIG_HEXAGON_PHYS_OFFSET
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern unsigned long __phys_offset;
>> #endif
>> #define PHYS_OFFSET __phys_offset
>> @@ -44,7 +44,7 @@ extern unsigned long __phys_offset;
>> #define STACK_TOP TASK_SIZE
>> #define STACK_TOP_MAX TASK_SIZE
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> enum fixed_addresses {
>> FIX_KMAP_BEGIN,
>> FIX_KMAP_END, /* check for per-cpuism */
>> @@ -101,7 +101,7 @@ extern int max_kernel_seg;
>> * and pkmap_base begins.
>> */
>> #define VMALLOC_END (PKMAP_BASE-PAGE_SIZE*2)
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* _ASM_HEXAGON_MEM_LAYOUT_H */
>> diff --git a/arch/hexagon/include/asm/page.h b/arch/hexagon/include/asm/
>> page.h
>> index 137ba7c5de481..7e651428a08c0 100644
>> --- a/arch/hexagon/include/asm/page.h
>> +++ b/arch/hexagon/include/asm/page.h
>> @@ -48,7 +48,7 @@
>> #include <vdso/page.h>
>> #ifdef __KERNEL__
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /*
>> * This is for PFN_DOWN, which mm.h needs. Seems the right place to
>> pull it in.
>> @@ -128,7 +128,7 @@ static inline unsigned long virt_to_pfn(const void
>> *kaddr)
>> /* XXX Todo: implement assembly-optimized version of getorder. */
>> #include <asm-generic/getorder.h>
>> -#endif /* ifdef __ASSEMBLY__ */
>> +#endif /* ifdef __ASSEMBLER__ */
>> #endif /* ifdef __KERNEL__ */
>> #endif
>> diff --git a/arch/hexagon/include/asm/processor.h b/arch/hexagon/include/
>> asm/processor.h
>> index 0cd39c2cdf8f7..b93c2cc4be22e 100644
>> --- a/arch/hexagon/include/asm/processor.h
>> +++ b/arch/hexagon/include/asm/processor.h
>> @@ -8,7 +8,7 @@
>> #ifndef _ASM_PROCESSOR_H
>> #define _ASM_PROCESSOR_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/mem-layout.h>
>> #include <asm/registers.h>
>> @@ -124,6 +124,6 @@ struct hexagon_switch_stack {
>> unsigned long lr;
>> };
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif
>> diff --git a/arch/hexagon/include/asm/thread_info.h b/arch/hexagon/
>> include/asm/thread_info.h
>> index e90f280b9ce3e..a0da6c694c87b 100644
>> --- a/arch/hexagon/include/asm/thread_info.h
>> +++ b/arch/hexagon/include/asm/thread_info.h
>> @@ -10,7 +10,7 @@
>> #ifdef __KERNEL__
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/processor.h>
>> #include <asm/registers.h>
>> #include <asm/page.h>
>> @@ -20,7 +20,7 @@
>> #define THREAD_SIZE (1<<THREAD_SHIFT)
>> #define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT)
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /*
>> * This is union'd with the "bottom" of the kernel stack.
>> @@ -47,13 +47,13 @@ struct thread_info {
>> unsigned long sp;
>> };
>> -#else /* !__ASSEMBLY__ */
>> +#else /* !__ASSEMBLER__ */
>> #include <asm/asm-offsets.h>
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define INIT_THREAD_INFO(tsk) \
>> { \
>> @@ -73,7 +73,7 @@ struct thread_info {
>> register struct thread_info *__current_thread_info
>> asm(QUOTED_THREADINFO_REG);
>> #define current_thread_info() __current_thread_info
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> /*
>> * thread information flags
>
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 14/41] loongarch: Replace __ASSEMBLY__ with __ASSEMBLER__ in the loongarch headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (12 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 13/41] hexagon: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 15/41] m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (26 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Huacai Chen, WANG Xuerui,
loongarch
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 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).
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: loongarch@lists.linux.dev
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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 | 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 ++--
26 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/arch/loongarch/include/asm/addrspace.h b/arch/loongarch/include/asm/addrspace.h
index fe198b473f849..e739dbc6329dc 100644
--- a/arch/loongarch/include/asm/addrspace.h
+++ b/arch/loongarch/include/asm/addrspace.h
@@ -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
diff --git a/arch/loongarch/include/asm/alternative-asm.h b/arch/loongarch/include/asm/alternative-asm.h
index ff3d10ac393f2..7dc29bd9b2f0e 100644
--- a/arch/loongarch/include/asm/alternative-asm.h
+++ b/arch/loongarch/include/asm/alternative-asm.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/alternative.h b/arch/loongarch/include/asm/alternative.h
index cee7b29785ab2..b5bae21fb3c85 100644
--- a/arch/loongarch/include/asm/alternative.h
+++ b/arch/loongarch/include/asm/alternative.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/asm-extable.h b/arch/loongarch/include/asm/asm-extable.h
index df05005f2b80a..d60bdf2e63775 100644
--- a/arch/loongarch/include/asm/asm-extable.h
+++ b/arch/loongarch/include/asm/asm-extable.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/asm.h b/arch/loongarch/include/asm/asm.h
index f591b3245def6..f018d26fc995a 100644
--- a/arch/loongarch/include/asm/asm.h
+++ b/arch/loongarch/include/asm/asm.h
@@ -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
diff --git a/arch/loongarch/include/asm/cpu.h b/arch/loongarch/include/asm/cpu.h
index 98cf4d7b4b0a0..dfb982fe87019 100644
--- a/arch/loongarch/include/asm/cpu.h
+++ b/arch/loongarch/include/asm/cpu.h
@@ -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
diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
index 6e0a99763a9a7..f4caaf764f9ee 100644
--- a/arch/loongarch/include/asm/ftrace.h
+++ b/arch/loongarch/include/asm/ftrace.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/gpr-num.h b/arch/loongarch/include/asm/gpr-num.h
index 996038da806d1..af95b941f48bd 100644
--- a/arch/loongarch/include/asm/gpr-num.h
+++ b/arch/loongarch/include/asm/gpr-num.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/irqflags.h b/arch/loongarch/include/asm/irqflags.h
index 319a8c616f1f5..fa898cfc367a3 100644
--- a/arch/loongarch/include/asm/irqflags.h
+++ b/arch/loongarch/include/asm/irqflags.h
@@ -5,7 +5,7 @@
#ifndef _ASM_IRQFLAGS_H
#define _ASM_IRQFLAGS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/stringify.h>
@@ -72,6 +72,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 */
diff --git a/arch/loongarch/include/asm/jump_label.h b/arch/loongarch/include/asm/jump_label.h
index 8a924bd69d196..4000c7603d8e3 100644
--- a/arch/loongarch/include/asm/jump_label.h
+++ b/arch/loongarch/include/asm/jump_label.h
@@ -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 ke
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_JUMP_LABEL_H */
diff --git a/arch/loongarch/include/asm/kasan.h b/arch/loongarch/include/asm/kasan.h
index 7f52bd31b9d4f..62f139a9c87da 100644
--- a/arch/loongarch/include/asm/kasan.h
+++ b/arch/loongarch/include/asm/kasan.h
@@ -2,7 +2,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
#include <linux/mmzone.h>
diff --git a/arch/loongarch/include/asm/loongarch.h b/arch/loongarch/include/asm/loongarch.h
index 52651aa0e5834..4d1a156d8ee07 100644
--- a/arch/loongarch/include/asm/loongarch.h
+++ b/arch/loongarch/include/asm/loongarch.h
@@ -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)
diff --git a/arch/loongarch/include/asm/orc_types.h b/arch/loongarch/include/asm/orc_types.h
index caf1f71a1057b..d5fa98d1d1779 100644
--- a/arch/loongarch/include/asm/orc_types.h
+++ b/arch/loongarch/include/asm/orc_types.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/page.h b/arch/loongarch/include/asm/page.h
index 7368f12b7cb1e..a3aaf34fba16a 100644
--- a/arch/loongarch/include/asm/page.h
+++ b/arch/loongarch/include/asm/page.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/pgtable-bits.h b/arch/loongarch/include/asm/pgtable-bits.h
index 45bfc65a0c9f9..7bbfb04a54cc3 100644
--- a/arch/loongarch/include/asm/pgtable-bits.h
+++ b/arch/loongarch/include/asm/pgtable-bits.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h
index da346733a1dae..5d1a0bc77ee43 100644
--- a/arch/loongarch/include/asm/pgtable.h
+++ b/arch/loongarch/include/asm/pgtable.h
@@ -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>
@@ -625,6 +625,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 */
diff --git a/arch/loongarch/include/asm/prefetch.h b/arch/loongarch/include/asm/prefetch.h
index 1672262a5e2ef..0b168cdaae9a9 100644
--- a/arch/loongarch/include/asm/prefetch.h
+++ b/arch/loongarch/include/asm/prefetch.h
@@ -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
diff --git a/arch/loongarch/include/asm/thread_info.h b/arch/loongarch/include/asm/thread_info.h
index 4f5a9441754e3..9dfa2ef008167 100644
--- a/arch/loongarch/include/asm/thread_info.h
+++ b/arch/loongarch/include/asm/thread_info.h
@@ -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)
register unsigned long current_stack_pointer __asm__("$sp");
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* thread information allocation */
#define THREAD_SIZE SZ_16K
diff --git a/arch/loongarch/include/asm/types.h b/arch/loongarch/include/asm/types.h
index baf15a0dcf8b5..0edd731f3d6a0 100644
--- a/arch/loongarch/include/asm/types.h
+++ b/arch/loongarch/include/asm/types.h
@@ -8,7 +8,7 @@
#include <asm-generic/int-ll64.h>
#include <uapi/asm/types.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ULCAST_
#define _U64CAST_
#else
diff --git a/arch/loongarch/include/asm/unwind_hints.h b/arch/loongarch/include/asm/unwind_hints.h
index a01086ad9ddea..42c442ec044e0 100644
--- a/arch/loongarch/include/asm/unwind_hints.h
+++ b/arch/loongarch/include/asm/unwind_hints.h
@@ -5,7 +5,7 @@
#include <linux/objtool.h>
#include <asm/orc_types.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro UNWIND_HINT_UNDEFINED
UNWIND_HINT type=UNWIND_HINT_TYPE_UNDEFINED
@@ -23,6 +23,6 @@
UNWIND_HINT sp_reg=ORC_REG_SP type=UNWIND_HINT_TYPE_CALL
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_LOONGARCH_UNWIND_HINTS_H */
diff --git a/arch/loongarch/include/asm/vdso/getrandom.h b/arch/loongarch/include/asm/vdso/getrandom.h
index e80f3c4ac7481..4fe152ca99f52 100644
--- a/arch/loongarch/include/asm/vdso/getrandom.h
+++ b/arch/loongarch/include/asm/vdso/getrandom.h
@@ -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>
@@ -33,6 +33,6 @@ static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void
return &_loongarch_data.rng_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETRANDOM_H */
diff --git a/arch/loongarch/include/asm/vdso/gettimeofday.h b/arch/loongarch/include/asm/vdso/gettimeofday.h
index 7eb3f041af764..3e150072cb5a7 100644
--- a/arch/loongarch/include/asm/vdso/gettimeofday.h
+++ b/arch/loongarch/include/asm/vdso/gettimeofday.h
@@ -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>
@@ -101,6 +101,6 @@ const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd)
return _timens_data;
}
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/loongarch/include/asm/vdso/processor.h b/arch/loongarch/include/asm/vdso/processor.h
index ef5770b343a01..1e255373b0b8e 100644
--- a/arch/loongarch/include/asm/vdso/processor.h
+++ b/arch/loongarch/include/asm/vdso/processor.h
@@ -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 */
diff --git a/arch/loongarch/include/asm/vdso/vdso.h b/arch/loongarch/include/asm/vdso/vdso.h
index 1c183a9b2115a..fa1951408f0a9 100644
--- a/arch/loongarch/include/asm/vdso/vdso.h
+++ b/arch/loongarch/include/asm/vdso/vdso.h
@@ -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>
@@ -50,6 +50,6 @@ enum vvar_pages {
extern struct loongarch_vdso_data _loongarch_data __attribute__((visibility("hidden")));
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/loongarch/include/asm/vdso/vsyscall.h b/arch/loongarch/include/asm/vdso/vsyscall.h
index 8987e951d0a93..8cbab22ba7d55 100644
--- a/arch/loongarch/include/asm/vdso/vsyscall.h
+++ b/arch/loongarch/include/asm/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
@@ -26,6 +26,6 @@ struct vdso_rng_data *__loongarch_get_k_vdso_rng_data(void)
/* 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 */
diff --git a/tools/arch/loongarch/include/asm/orc_types.h b/tools/arch/loongarch/include/asm/orc_types.h
index caf1f71a1057b..d5fa98d1d1779 100644
--- a/tools/arch/loongarch/include/asm/orc_types.h
+++ b/tools/arch/loongarch/include/asm/orc_types.h
@@ -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.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 15/41] m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (13 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 14/41] loongarch: Replace __ASSEMBLY__ with __ASSEMBLER__ in the loongarch headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 16/41] m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (25 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Geert Uytterhoeven,
linux-m68k
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/m68k/include/uapi/asm/bootinfo-vme.h | 4 ++--
arch/m68k/include/uapi/asm/bootinfo.h | 8 ++++----
arch/m68k/include/uapi/asm/ptrace.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/m68k/include/uapi/asm/bootinfo-vme.h b/arch/m68k/include/uapi/asm/bootinfo-vme.h
index f36a09ab5e79b..b8139eb393524 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-vme.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-vme.h
@@ -33,7 +33,7 @@
#define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Board ID data structure - pointer to this retrieved from Bug by head.S
@@ -56,7 +56,7 @@ typedef struct {
__be32 option2;
} t_bdid, *p_bdid;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
diff --git a/arch/m68k/include/uapi/asm/bootinfo.h b/arch/m68k/include/uapi/asm/bootinfo.h
index 024e87d7095f8..28d2d44c08d06 100644
--- a/arch/m68k/include/uapi/asm/bootinfo.h
+++ b/arch/m68k/include/uapi/asm/bootinfo.h
@@ -16,7 +16,7 @@
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Bootinfo definitions
@@ -43,7 +43,7 @@ struct mem_info {
__be32 size; /* length of memory chunk (in bytes) */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
@@ -167,7 +167,7 @@ struct mem_info {
#define BI_VERSION_MAJOR(v) (((v) >> 16) & 0xffff)
#define BI_VERSION_MINOR(v) ((v) & 0xffff)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct bootversion {
__be16 branch;
@@ -178,7 +178,7 @@ struct bootversion {
} machversions[];
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_M68K_BOOTINFO_H */
diff --git a/arch/m68k/include/uapi/asm/ptrace.h b/arch/m68k/include/uapi/asm/ptrace.h
index ebd9fccb3d11f..d70f771399b40 100644
--- a/arch/m68k/include/uapi/asm/ptrace.h
+++ b/arch/m68k/include/uapi/asm/ptrace.h
@@ -22,7 +22,7 @@
#define PT_SR 17
#define PT_PC 18
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* this struct defines the way the registers are stored on the
stack during a system call. */
@@ -81,5 +81,5 @@ struct switch_stack {
#define PTRACE_GETFDPIC_EXEC 0
#define PTRACE_GETFDPIC_INTERP 1
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_M68K_PTRACE_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 16/41] m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (14 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 15/41] m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 17/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (24 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Geert Uytterhoeven,
linux-m68k
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 almost a completely mechanical patch (done with a simple
"sed -i" statement), with one comment tweaked manually in
arch/m68k/include/asm/mac_baboon.h (which was missing underscores).
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/m68k/include/asm/adb_iop.h | 4 ++--
arch/m68k/include/asm/bootinfo.h | 4 ++--
arch/m68k/include/asm/entry.h | 4 ++--
arch/m68k/include/asm/kexec.h | 4 ++--
arch/m68k/include/asm/mac_baboon.h | 4 ++--
arch/m68k/include/asm/mac_iop.h | 4 ++--
arch/m68k/include/asm/mac_oss.h | 4 ++--
arch/m68k/include/asm/mac_psc.h | 4 ++--
arch/m68k/include/asm/mac_via.h | 4 ++--
arch/m68k/include/asm/math-emu.h | 6 +++---
arch/m68k/include/asm/mcf_pgtable.h | 4 ++--
arch/m68k/include/asm/mcfmmu.h | 2 +-
arch/m68k/include/asm/motorola_pgtable.h | 4 ++--
arch/m68k/include/asm/nettel.h | 4 ++--
arch/m68k/include/asm/openprom.h | 4 ++--
arch/m68k/include/asm/page.h | 4 ++--
arch/m68k/include/asm/page_mm.h | 4 ++--
arch/m68k/include/asm/page_no.h | 4 ++--
arch/m68k/include/asm/pgtable.h | 2 +-
arch/m68k/include/asm/pgtable_mm.h | 8 ++++----
arch/m68k/include/asm/ptrace.h | 4 ++--
arch/m68k/include/asm/setup.h | 10 +++++-----
arch/m68k/include/asm/sun3_pgtable.h | 8 ++++----
arch/m68k/include/asm/sun3mmu.h | 4 ++--
arch/m68k/include/asm/thread_info.h | 6 +++---
arch/m68k/include/asm/traps.h | 6 +++---
arch/m68k/math-emu/fp_emu.h | 8 ++++----
27 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/arch/m68k/include/asm/adb_iop.h b/arch/m68k/include/asm/adb_iop.h
index 6aecd020e2fc9..ca10b1ec0c785 100644
--- a/arch/m68k/include/asm/adb_iop.h
+++ b/arch/m68k/include/asm/adb_iop.h
@@ -33,7 +33,7 @@
#define ADB_IOP_SRQ 0x04 /* SRQ detected */
#define ADB_IOP_TIMEOUT 0x02 /* nonzero if timeout */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct adb_iopmsg {
__u8 flags; /* ADB flags */
@@ -43,4 +43,4 @@ struct adb_iopmsg {
__u8 spare[21]; /* spare */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index 81c91af8ec6c0..267272b436e27 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -14,7 +14,7 @@
#include <uapi/asm/bootinfo.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_BOOTINFO_PROC
extern void save_bootinfo(const struct bi_record *bi);
@@ -28,7 +28,7 @@ void process_uboot_commandline(char *commandp, int size);
static inline void process_uboot_commandline(char *commandp, int size) {}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _M68K_BOOTINFO_H */
diff --git a/arch/m68k/include/asm/entry.h b/arch/m68k/include/asm/entry.h
index 9b52b060c76ab..86cba7c19e679 100644
--- a/arch/m68k/include/asm/entry.h
+++ b/arch/m68k/include/asm/entry.h
@@ -4,7 +4,7 @@
#include <asm/setup.h>
#include <asm/page.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/thread_info.h>
#endif
@@ -41,7 +41,7 @@
#define ALLOWINT (~0x700)
#endif /* machine compilation types */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* This defines the normal kernel pt-regs layout.
*
diff --git a/arch/m68k/include/asm/kexec.h b/arch/m68k/include/asm/kexec.h
index 3b0b64f0a3531..f79427bd64878 100644
--- a/arch/m68k/include/asm/kexec.h
+++ b/arch/m68k/include/asm/kexec.h
@@ -15,7 +15,7 @@
#define KEXEC_ARCH KEXEC_ARCH_68K
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void crash_setup_regs(struct pt_regs *newregs,
struct pt_regs *oldregs)
@@ -23,7 +23,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
/* Dummy implementation for now */
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_KEXEC_CORE */
diff --git a/arch/m68k/include/asm/mac_baboon.h b/arch/m68k/include/asm/mac_baboon.h
index 08d9b8829a1ab..ed5b5b48bdf83 100644
--- a/arch/m68k/include/asm/mac_baboon.h
+++ b/arch/m68k/include/asm/mac_baboon.h
@@ -5,7 +5,7 @@
#define BABOON_BASE (0x50F1A000) /* same as IDE controller base */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct baboon {
char pad1[208]; /* generic IDE registers, not used here */
@@ -36,4 +36,4 @@ extern void baboon_register_interrupts(void);
extern void baboon_irq_enable(int);
extern void baboon_irq_disable(int);
-#endif /* __ASSEMBLY **/
+#endif /* __ASSEMBLER__ */
diff --git a/arch/m68k/include/asm/mac_iop.h b/arch/m68k/include/asm/mac_iop.h
index 32f1c79c818f1..a6753eb16ba46 100644
--- a/arch/m68k/include/asm/mac_iop.h
+++ b/arch/m68k/include/asm/mac_iop.h
@@ -66,7 +66,7 @@
#define IOP_ADDR_ALIVE 0x031F
#define IOP_ADDR_RECV_MSG 0x0320
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* IOP Control registers, staggered because in usual Apple style they were
@@ -163,4 +163,4 @@ extern void iop_ism_irq_poll(uint);
extern void iop_register_interrupts(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/m68k/include/asm/mac_oss.h b/arch/m68k/include/asm/mac_oss.h
index 56ef986c0a9b1..a6e86e443155f 100644
--- a/arch/m68k/include/asm/mac_oss.h
+++ b/arch/m68k/include/asm/mac_oss.h
@@ -59,7 +59,7 @@
#define OSS_POWEROFF 0x80
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mac_oss {
__u8 irq_level[0x10]; /* [0x000-0x00f] Interrupt levels */
@@ -77,4 +77,4 @@ extern void oss_register_interrupts(void);
extern void oss_irq_enable(int);
extern void oss_irq_disable(int);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/m68k/include/asm/mac_psc.h b/arch/m68k/include/asm/mac_psc.h
index 86a5a5eab89ed..6587dbd544764 100644
--- a/arch/m68k/include/asm/mac_psc.h
+++ b/arch/m68k/include/asm/mac_psc.h
@@ -207,7 +207,7 @@
* Unknown, always 0x0000.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern volatile __u8 *psc;
@@ -249,4 +249,4 @@ static inline u32 psc_read_long(int offset)
return *((volatile __u32 *)(psc + offset));
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/m68k/include/asm/mac_via.h b/arch/m68k/include/asm/mac_via.h
index a9ef1e9ba6c41..b065cd8e5071e 100644
--- a/arch/m68k/include/asm/mac_via.h
+++ b/arch/m68k/include/asm/mac_via.h
@@ -250,7 +250,7 @@
#define IER_SET_BIT(b) (0x80 | (1<<(b)) )
#define IER_CLR_BIT(b) (0x7F & (1<<(b)) )
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern volatile __u8 *via1,*via2;
extern int rbv_present,via_alt_mapping;
@@ -267,6 +267,6 @@ extern void via1_irq(struct irq_desc *desc);
extern void via1_set_head(int);
extern int via2_scsi_drq_pending(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_MAC_VIA_H_ */
diff --git a/arch/m68k/include/asm/math-emu.h b/arch/m68k/include/asm/math-emu.h
index eefaa3a2b596f..91074ade14ad6 100644
--- a/arch/m68k/include/asm/math-emu.h
+++ b/arch/m68k/include/asm/math-emu.h
@@ -67,7 +67,7 @@
#define PMUNIMPL (1<<PUNIMPL)
#define PMMOVEM (1<<PMOVEM)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kernel.h>
#include <linux/sched.h>
@@ -127,7 +127,7 @@ extern unsigned int fp_debugprint;
#define FPDATA ((struct fp_data *)current->thread.fp)
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define FPDATA %a2
@@ -311,6 +311,6 @@ old_gas=old_gas+1
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_M68K_SETUP_H */
diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h
index 48f87a8a88320..a6189351aa907 100644
--- a/arch/m68k/include/asm/mcf_pgtable.h
+++ b/arch/m68k/include/asm/mcf_pgtable.h
@@ -92,7 +92,7 @@
#define PTE_MASK PAGE_MASK
#define CF_PAGE_CHG_MASK (PTE_MASK | CF_PAGE_ACCESSED | CF_PAGE_DIRTY)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pmd_pgtable(pmd) pfn_to_virt(pmd_val(pmd) >> PAGE_SHIFT)
@@ -298,5 +298,5 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
#define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _MCF_PGTABLE_H */
diff --git a/arch/m68k/include/asm/mcfmmu.h b/arch/m68k/include/asm/mcfmmu.h
index 283352ab0d5d8..db16ea1057f7b 100644
--- a/arch/m68k/include/asm/mcfmmu.h
+++ b/arch/m68k/include/asm/mcfmmu.h
@@ -88,7 +88,7 @@
#define MMUDR_PAN 10 /* Physical address */
#define MMUDR_PAMASK 0xfffffc00 /* PA mask */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Simple access functions for the MMU registers. Nothing fancy
diff --git a/arch/m68k/include/asm/motorola_pgtable.h b/arch/m68k/include/asm/motorola_pgtable.h
index 9866c7acdabe1..aea231a2b2c04 100644
--- a/arch/m68k/include/asm/motorola_pgtable.h
+++ b/arch/m68k/include/asm/motorola_pgtable.h
@@ -44,7 +44,7 @@
/* We borrow bit 11 to store the exclusive marker in swap PTEs. */
#define _PAGE_SWP_EXCLUSIVE 0x800
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* This is the cache mode to be used for pages containing page descriptors for
* processors >= '040. It is in pte_mknocache(), and the variable is defined
@@ -208,5 +208,5 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
return pte;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _MOTOROLA_PGTABLE_H */
diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h
index 3bd4b7a4613f6..9bf55cef119e2 100644
--- a/arch/m68k/include/asm/nettel.h
+++ b/arch/m68k/include/asm/nettel.h
@@ -38,7 +38,7 @@
#define NETtel_LEDADDR 0x30400000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern volatile unsigned short ppdata;
@@ -80,7 +80,7 @@ static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits)
#define MCFPP_DTR0 0x0040
#define MCFPP_DTR1 0x0000 /* Port 1 no DTR support */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These functions defined to give quasi generic access to the
* PPIO bits used for DTR/DCD.
diff --git a/arch/m68k/include/asm/openprom.h b/arch/m68k/include/asm/openprom.h
index dd22e649f5c56..6456ba40a9464 100644
--- a/arch/m68k/include/asm/openprom.h
+++ b/arch/m68k/include/asm/openprom.h
@@ -21,7 +21,7 @@
#define LINUX_OPPROM_MAGIC 0x10010407
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* V0 prom device operations. */
struct linux_dev_v0_funcs {
int (*v0_devopen)(char *device_str);
@@ -308,6 +308,6 @@ struct linux_prom_ranges {
unsigned int or_size;
};
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC_OPENPROM_H) */
diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h
index b173ba27d36f1..d30f8b2f15927 100644
--- a/arch/m68k/include/asm/page.h
+++ b/arch/m68k/include/asm/page.h
@@ -10,7 +10,7 @@
#define PAGE_OFFSET (PAGE_OFFSET_RAW)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These are used to make use of C type-checking..
@@ -48,7 +48,7 @@ extern unsigned long _rambase;
extern unsigned long _ramstart;
extern unsigned long _ramend;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_MMU
#include <asm/page_mm.h>
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index e0ae4d5fc9859..ed782609ca413 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -2,7 +2,7 @@
#ifndef _M68K_PAGE_MM_H
#define _M68K_PAGE_MM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <asm/module.h>
@@ -144,6 +144,6 @@ extern int m68k_virt_to_node_shift;
#define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory)
#define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _M68K_PAGE_MM_H */
diff --git a/arch/m68k/include/asm/page_no.h b/arch/m68k/include/asm/page_no.h
index 63c0e706084b1..39db2026a4b4c 100644
--- a/arch/m68k/include/asm/page_no.h
+++ b/arch/m68k/include/asm/page_no.h
@@ -2,7 +2,7 @@
#ifndef _M68K_PAGE_NO_H
#define _M68K_PAGE_NO_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long memory_start;
extern unsigned long memory_end;
@@ -37,6 +37,6 @@ static inline void *pfn_to_virt(unsigned long pfn)
#define ARCH_PFN_OFFSET PHYS_PFN(PAGE_OFFSET_RAW)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _M68K_PAGE_NO_H */
diff --git a/arch/m68k/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable.h
index 49fcfd7348600..02f1a4601379f 100644
--- a/arch/m68k/include/asm/pgtable.h
+++ b/arch/m68k/include/asm/pgtable.h
@@ -10,7 +10,7 @@
#include <asm/pgtable_mm.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void paging_init(void);
#endif
diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h
index dbdf1c2b2f66b..62f2ff4e6799b 100644
--- a/arch/m68k/include/asm/pgtable_mm.h
+++ b/arch/m68k/include/asm/pgtable_mm.h
@@ -11,7 +11,7 @@
#include <asm/setup.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <linux/sched.h>
#include <linux/threads.h>
@@ -145,7 +145,7 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,
#define update_mmu_cache(vma, addr, ptep) \
update_mmu_cache_range(NULL, vma, addr, ptep, 1)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* MMU-specific headers */
@@ -157,7 +157,7 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf,
#include <asm/motorola_pgtable.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Macro to mark a page protection value as "uncacheable".
*/
@@ -182,6 +182,6 @@ pgprot_t pgprot_dmacoherent(pgprot_t prot);
#define pgprot_dmacoherent(prot) pgprot_dmacoherent(prot)
#endif /* CONFIG_COLDFIRE */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _M68K_PGTABLE_H */
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
index ea5a80ca1ab33..bc86ce012025e 100644
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -4,7 +4,7 @@
#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef PS_S
#define PS_S (0x2000)
@@ -24,5 +24,5 @@
#define arch_has_block_step() (1)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _M68K_PTRACE_H */
diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h
index 2c99477aaf89a..e4ec169f5c7d6 100644
--- a/arch/m68k/include/asm/setup.h
+++ b/arch/m68k/include/asm/setup.h
@@ -28,9 +28,9 @@
#define CL_SIZE COMMAND_LINE_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long m68k_machtype;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#if !defined(CONFIG_AMIGA)
# define MACH_IS_AMIGA (0)
@@ -199,7 +199,7 @@ extern unsigned long m68k_machtype;
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long m68k_cputype;
extern unsigned long m68k_fputype;
extern unsigned long m68k_mmutype;
@@ -213,7 +213,7 @@ extern unsigned long vme_brdtype;
*/
extern int m68k_is040or060;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#if !defined(CONFIG_M68020)
# define CPU_IS_020 (0)
@@ -321,7 +321,7 @@ extern int m68k_is040or060;
#define NUM_MEMINFO 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct m68k_mem_info {
unsigned long addr; /* physical address of memory chunk */
unsigned long size; /* length of memory chunk (in bytes) */
diff --git a/arch/m68k/include/asm/sun3_pgtable.h b/arch/m68k/include/asm/sun3_pgtable.h
index 30081aee81643..bdbeaa90dbcc7 100644
--- a/arch/m68k/include/asm/sun3_pgtable.h
+++ b/arch/m68k/include/asm/sun3_pgtable.h
@@ -4,7 +4,7 @@
#include <asm/sun3mmu.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/virtconvert.h>
#include <linux/linkage.h>
@@ -19,7 +19,7 @@
#define PTOV(addr) __va(addr)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* These need to be defined for compatibility although the sun3 doesn't use them */
#define _PAGE_NOCACHE030 0x040
@@ -74,7 +74,7 @@
/* We borrow bit 6 to store the exclusive marker in swap PTEs. */
#define _PAGE_SWP_EXCLUSIVE 0x040
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Conversion functions: convert a page and protection to a page entry,
@@ -192,5 +192,5 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
return pte;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !_SUN3_PGTABLE_H */
diff --git a/arch/m68k/include/asm/sun3mmu.h b/arch/m68k/include/asm/sun3mmu.h
index 21a75daa278f2..fee05cd2ce5ba 100644
--- a/arch/m68k/include/asm/sun3mmu.h
+++ b/arch/m68k/include/asm/sun3mmu.h
@@ -67,7 +67,7 @@
#define SUN3_BUSERR_PROTERR (0x40)
#define SUN3_BUSERR_INVALID (0x80)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Read bus error status register (implicitly clearing it). */
static inline unsigned char sun3_get_buserr(void)
@@ -167,6 +167,6 @@ extern void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
extern int sun3_map_test(unsigned long addr, char *val);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !__SUN3_MMU_H__ */
diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
index 3e31adbddc75f..5cb3ace556222 100644
--- a/arch/m68k/include/asm/thread_info.h
+++ b/arch/m68k/include/asm/thread_info.h
@@ -22,7 +22,7 @@
#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct thread_info {
struct task_struct *task; /* main task structure */
@@ -31,7 +31,7 @@ struct thread_info {
__u32 cpu; /* should always be 0 on m68k */
unsigned long tp_value; /* thread pointer */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define INIT_THREAD_INFO(tsk) \
{ \
@@ -39,7 +39,7 @@ struct thread_info {
.preempt_count = INIT_PREEMPT_COUNT, \
}
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* how to get the thread information struct from C */
static inline struct thread_info *current_thread_info(void)
{
diff --git a/arch/m68k/include/asm/traps.h b/arch/m68k/include/asm/traps.h
index a9d5c1c870d31..c7b3989bd4b25 100644
--- a/arch/m68k/include/asm/traps.h
+++ b/arch/m68k/include/asm/traps.h
@@ -11,7 +11,7 @@
#ifndef _M68K_TRAPS_H
#define _M68K_TRAPS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
#include <asm/ptrace.h>
@@ -94,7 +94,7 @@ asmlinkage void bad_inthandler(void);
#define VECOFF(vec) ((vec)<<2)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Status register bits */
#define PS_T (0x8000)
@@ -271,6 +271,6 @@ struct frame {
asmlinkage void berr_040cleanup(struct frame *fp);
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _M68K_TRAPS_H */
diff --git a/arch/m68k/math-emu/fp_emu.h b/arch/m68k/math-emu/fp_emu.h
index c1ecfef7886a6..6ac811c31ca4d 100644
--- a/arch/m68k/math-emu/fp_emu.h
+++ b/arch/m68k/math-emu/fp_emu.h
@@ -38,12 +38,12 @@
#ifndef _FP_EMU_H
#define _FP_EMU_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#endif
#include <asm/math-emu.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define IS_INF(a) ((a)->exp == 0x7fff)
#define IS_ZERO(a) ((a)->mant.m64 == 0)
@@ -124,7 +124,7 @@ extern const struct fp_ext fp_Inf;
: "a1", "d1", "d2", "memory"); \
})
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/*
* set, reset or clear a bit in the fp status register
@@ -141,6 +141,6 @@ extern const struct fp_ext fp_Inf;
btst #(\bit&7),(FPD_FPSR+3-(\bit/8),FPDATA)
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _FP_EMU_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 17/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (15 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 16/41] m68k: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-06-10 13:19 ` Michal Simek
2025-03-14 7:09 ` [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (23 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Michal Simek
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/microblaze/include/uapi/asm/ptrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/microblaze/include/uapi/asm/ptrace.h b/arch/microblaze/include/uapi/asm/ptrace.h
index 46dd94cb78021..8039957a1a9cd 100644
--- a/arch/microblaze/include/uapi/asm/ptrace.h
+++ b/arch/microblaze/include/uapi/asm/ptrace.h
@@ -10,7 +10,7 @@
#ifndef _UAPI_ASM_MICROBLAZE_PTRACE_H
#define _UAPI_ASM_MICROBLAZE_PTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef unsigned long microblaze_reg_t;
@@ -68,6 +68,6 @@ struct pt_regs {
#endif /* __KERNEL */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_MICROBLAZE_PTRACE_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 17/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 ` [PATCH 17/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-06-10 13:19 ` Michal Simek
0 siblings, 0 replies; 94+ messages in thread
From: Michal Simek @ 2025-06-10 13:19 UTC (permalink / raw)
To: Thomas Huth, linux-kernel; +Cc: Arnd Bergmann, linux-arch
On 3/14/25 08:09, Thomas Huth wrote:
> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> this is not really useful for uapi headers (unless the userspace
> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> gets set automatically by the compiler when compiling assembly
> code.
>
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
>
> Cc: Michal Simek <monstr@monstr.eu>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/microblaze/include/uapi/asm/ptrace.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/microblaze/include/uapi/asm/ptrace.h b/arch/microblaze/include/uapi/asm/ptrace.h
> index 46dd94cb78021..8039957a1a9cd 100644
> --- a/arch/microblaze/include/uapi/asm/ptrace.h
> +++ b/arch/microblaze/include/uapi/asm/ptrace.h
> @@ -10,7 +10,7 @@
> #ifndef _UAPI_ASM_MICROBLAZE_PTRACE_H
> #define _UAPI_ASM_MICROBLAZE_PTRACE_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> typedef unsigned long microblaze_reg_t;
>
> @@ -68,6 +68,6 @@ struct pt_regs {
>
> #endif /* __KERNEL */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* _UAPI_ASM_MICROBLAZE_PTRACE_H */
Applied.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs
TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (16 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 17/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-06-10 7:26 ` Michal Simek
2025-06-10 13:19 ` Michal Simek
2025-03-14 7:09 ` [PATCH 19/41] mips: Replace __ASSEMBLY__ with __ASSEMBLER__ in the mips headers Thomas Huth
` (22 subsequent siblings)
40 siblings, 2 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Michal Simek
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: Michal Simek <monstr@monstr.eu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/microblaze/include/asm/asm-compat.h | 2 +-
arch/microblaze/include/asm/current.h | 4 ++--
arch/microblaze/include/asm/entry.h | 4 ++--
arch/microblaze/include/asm/exceptions.h | 4 ++--
arch/microblaze/include/asm/fixmap.h | 4 ++--
arch/microblaze/include/asm/ftrace.h | 2 +-
arch/microblaze/include/asm/kgdb.h | 4 ++--
arch/microblaze/include/asm/mmu.h | 4 ++--
arch/microblaze/include/asm/page.h | 8 ++++----
arch/microblaze/include/asm/pgtable.h | 18 +++++++++---------
arch/microblaze/include/asm/processor.h | 8 ++++----
arch/microblaze/include/asm/ptrace.h | 4 ++--
arch/microblaze/include/asm/sections.h | 4 ++--
arch/microblaze/include/asm/setup.h | 4 ++--
arch/microblaze/include/asm/thread_info.h | 4 ++--
arch/microblaze/include/asm/unistd.h | 4 ++--
.../microblaze/include/asm/xilinx_mb_manager.h | 4 ++--
17 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/arch/microblaze/include/asm/asm-compat.h b/arch/microblaze/include/asm/asm-compat.h
index c05259ce2d2c2..9f04614762319 100644
--- a/arch/microblaze/include/asm/asm-compat.h
+++ b/arch/microblaze/include/asm/asm-compat.h
@@ -4,7 +4,7 @@
#include <asm/types.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define stringify_in_c(...) __VA_ARGS__
# define ASM_CONST(x) x
#else
diff --git a/arch/microblaze/include/asm/current.h b/arch/microblaze/include/asm/current.h
index a4bb45be30e69..099e69f32bf97 100644
--- a/arch/microblaze/include/asm/current.h
+++ b/arch/microblaze/include/asm/current.h
@@ -14,13 +14,13 @@
* but check asm/microblaze/kernel/entry.S to be sure.
*/
#define CURRENT_TASK r31
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
/*
* Dedicate r31 to keeping the current task pointer
*/
register struct task_struct *current asm("r31");
# define get_current() current
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_CURRENT_H */
diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h
index 6c42bed411662..9efadf12397ca 100644
--- a/arch/microblaze/include/asm/entry.h
+++ b/arch/microblaze/include/asm/entry.h
@@ -21,7 +21,7 @@
#define PER_CPU(var) var
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */
DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */
DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */
@@ -29,6 +29,6 @@ DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */
DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */
extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_ENTRY_H */
diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h
index 967f175173e14..c4591e4f7175b 100644
--- a/arch/microblaze/include/asm/exceptions.h
+++ b/arch/microblaze/include/asm/exceptions.h
@@ -11,7 +11,7 @@
#define _ASM_MICROBLAZE_EXCEPTIONS_H
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Macros to enable and disable HW exceptions in the MSR */
/* Define MSR enable bit for HW exceptions */
@@ -64,6 +64,6 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig);
void die(const char *str, struct pt_regs *fp, long err);
void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
-#endif /*__ASSEMBLY__ */
+#endif /*__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_MICROBLAZE_EXCEPTIONS_H */
diff --git a/arch/microblaze/include/asm/fixmap.h b/arch/microblaze/include/asm/fixmap.h
index e6e9288bff761..f9797849e4d43 100644
--- a/arch/microblaze/include/asm/fixmap.h
+++ b/arch/microblaze/include/asm/fixmap.h
@@ -15,7 +15,7 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kernel.h>
#include <asm/page.h>
#ifdef CONFIG_HIGHMEM
@@ -62,5 +62,5 @@ extern void __set_fixmap(enum fixed_addresses idx,
#include <asm-generic/fixmap.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/microblaze/include/asm/ftrace.h b/arch/microblaze/include/asm/ftrace.h
index 4ca38b92a3a20..27c1bafb669c3 100644
--- a/arch/microblaze/include/asm/ftrace.h
+++ b/arch/microblaze/include/asm/ftrace.h
@@ -7,7 +7,7 @@
#define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 8 /* sizeof mcount call */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void _mcount(void);
extern void ftrace_call_graph(void);
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr);
diff --git a/arch/microblaze/include/asm/kgdb.h b/arch/microblaze/include/asm/kgdb.h
index 8dc5ebb07fd5a..321c3c8bfcf27 100644
--- a/arch/microblaze/include/asm/kgdb.h
+++ b/arch/microblaze/include/asm/kgdb.h
@@ -3,7 +3,7 @@
#ifndef __MICROBLAZE_KGDB_H__
#define __MICROBLAZE_KGDB_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define CACHE_FLUSH_IS_SAFE 1
#define BUFMAX 2048
@@ -27,6 +27,6 @@ static inline void arch_kgdb_breakpoint(void)
struct pt_regs;
asmlinkage void microblaze_kgdb_break(struct pt_regs *regs);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __MICROBLAZE_KGDB_H__ */
#endif /* __KERNEL__ */
diff --git a/arch/microblaze/include/asm/mmu.h b/arch/microblaze/include/asm/mmu.h
index b928a87c00766..7262dc4da3385 100644
--- a/arch/microblaze/include/asm/mmu.h
+++ b/arch/microblaze/include/asm/mmu.h
@@ -9,7 +9,7 @@
#define _ASM_MICROBLAZE_MMU_H
# ifdef __KERNEL__
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
/* Default "unsigned long" context */
typedef unsigned long mm_context_t;
@@ -56,7 +56,7 @@ extern void _tlbia(void); /* invalidate all TLB entries */
* mapping has to increase tlb_skip size.
*/
extern u32 tlb_skip;
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
/*
* The MicroBlaze processor has a TLB architecture identical to PPC-40x. The
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h
index 90fc9c81debda..90ac9f34b4b49 100644
--- a/arch/microblaze/include/asm/page.h
+++ b/arch/microblaze/include/asm/page.h
@@ -25,7 +25,7 @@
#define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* PAGE_OFFSET -- the first address of the first page of memory. With MMU
@@ -100,7 +100,7 @@ extern int page_is_ram(unsigned long pfn);
# define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
# define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT)
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
/* Convert between virtual and physical address for MMU. */
/* Handle MicroBlaze processor with virtual memory. */
@@ -113,7 +113,7 @@ extern int page_is_ram(unsigned long pfn);
#define tovirt(rd, rs) \
addik rd, rs, (CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# define __pa(x) __virt_to_phys((unsigned long)(x))
# define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
@@ -130,7 +130,7 @@ static inline const void *pfn_to_virt(unsigned long pfn)
#define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr)))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define TOPHYS(addr) __virt_to_phys(addr)
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h
index e4ea2ec3642f0..eadc73d22dda6 100644
--- a/arch/microblaze/include/asm/pgtable.h
+++ b/arch/microblaze/include/asm/pgtable.h
@@ -10,14 +10,14 @@
#include <asm/setup.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int mem_init_done;
#endif
#include <asm-generic/pgtable-nopmd.h>
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sched.h>
#include <linux/threads.h>
@@ -39,7 +39,7 @@ extern pte_t *va_to_pte(unsigned long address);
#define VMALLOC_START (CONFIG_KERNEL_START + CONFIG_LOWMEM_SIZE)
#define VMALLOC_END ioremap_bot
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Macro to mark a page protection value as "uncacheable".
@@ -208,7 +208,7 @@ extern pte_t *va_to_pte(unsigned long address);
* Also, write permissions imply read permissions.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* ZERO_PAGE is a global shared page that is always zero: used
* for zero-mapped memory areas etc..
@@ -216,7 +216,7 @@ extern pte_t *va_to_pte(unsigned long address);
extern unsigned long empty_zero_page[1024];
#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define pte_none(pte) ((pte_val(pte) & ~_PTE_NONE_MASK) == 0)
#define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT)
@@ -237,7 +237,7 @@ extern unsigned long empty_zero_page[1024];
#define pfn_pte(pfn, prot) \
__pte(((pte_basic_t)(pfn) << PFN_PTE_SHIFT) | pgprot_val(prot))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The following only work if pte_present() is true.
* Undefined behaviour if not..
@@ -444,13 +444,13 @@ extern int mem_init_done;
asmlinkage void __init mmu_init(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long ioremap_bot, ioremap_base;
void setup_memory(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_PGTABLE_H */
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 4e193c7550dfa..d59bdfffca7cc 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -14,7 +14,7 @@
#include <asm/entry.h>
#include <asm/current.h>
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
/* from kernel/cpu/mb.c */
extern const struct seq_operations cpuinfo_op;
@@ -29,7 +29,7 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);
extern void ret_from_fork(void);
extern void ret_from_kernel_thread(void);
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
/*
* This is used to define STACK_TOP, and with MMU it must be below
@@ -45,7 +45,7 @@ extern void ret_from_kernel_thread(void);
# define THREAD_KSP 0
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
/* If you change this, you must change the associated assembly-languages
* constants defined below, THREAD_*.
@@ -88,5 +88,5 @@ unsigned long __get_wchan(struct task_struct *p);
extern struct dentry *of_debugfs_root;
#endif
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_PROCESSOR_H */
diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h
index bfcb89df5e26f..17982292a64fd 100644
--- a/arch/microblaze/include/asm/ptrace.h
+++ b/arch/microblaze/include/asm/ptrace.h
@@ -7,7 +7,7 @@
#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define kernel_mode(regs) ((regs)->pt_mode)
#define user_mode(regs) (!kernel_mode(regs))
@@ -20,5 +20,5 @@ static inline long regs_return_value(struct pt_regs *regs)
return regs->r3;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_PTRACE_H */
diff --git a/arch/microblaze/include/asm/sections.h b/arch/microblaze/include/asm/sections.h
index a9311ad84a67f..f5008f5e7a5c1 100644
--- a/arch/microblaze/include/asm/sections.h
+++ b/arch/microblaze/include/asm/sections.h
@@ -10,11 +10,11 @@
#include <asm-generic/sections.h>
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
extern char _ssbss[], _esbss[];
extern unsigned long __ivt_start[], __ivt_end[];
extern u32 _fdt_start[], _fdt_end[];
-# endif /* !__ASSEMBLY__ */
+# endif /* !__ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_SECTIONS_H */
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
index bf2600f759593..837ed0bbae4b5 100644
--- a/arch/microblaze/include/asm/setup.h
+++ b/arch/microblaze/include/asm/setup.h
@@ -9,7 +9,7 @@
#include <uapi/asm/setup.h>
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
extern char cmd_line[COMMAND_LINE_SIZE];
extern char *klimit;
@@ -25,5 +25,5 @@ void machine_shutdown(void);
void machine_halt(void);
void machine_power_off(void);
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_SETUP_H */
diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h
index a0ddd2a36fb94..0153f7c2717c9 100644
--- a/arch/microblaze/include/asm/thread_info.h
+++ b/arch/microblaze/include/asm/thread_info.h
@@ -13,7 +13,7 @@
#define THREAD_SIZE (1 << THREAD_SHIFT)
#define THREAD_SIZE_ORDER 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# include <linux/types.h>
# include <asm/processor.h>
@@ -86,7 +86,7 @@ static inline struct thread_info *current_thread_info(void)
}
/* thread information allocation */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* thread information flags
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index cfe3f888b432b..fedda9908aa94 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -8,7 +8,7 @@
#include <uapi/asm/unistd.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* #define __ARCH_WANT_OLD_READDIR */
/* #define __ARCH_WANT_OLD_STAT */
@@ -33,6 +33,6 @@
#define __ARCH_WANT_SYS_VFORK
#define __ARCH_WANT_SYS_FORK
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_MICROBLAZE_UNISTD_H */
diff --git a/arch/microblaze/include/asm/xilinx_mb_manager.h b/arch/microblaze/include/asm/xilinx_mb_manager.h
index 7b6995722b0c0..121a3224882b2 100644
--- a/arch/microblaze/include/asm/xilinx_mb_manager.h
+++ b/arch/microblaze/include/asm/xilinx_mb_manager.h
@@ -5,7 +5,7 @@
#ifndef _XILINX_MB_MANAGER_H
#define _XILINX_MB_MANAGER_H
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
#include <linux/of_address.h>
@@ -21,7 +21,7 @@ void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val,
void *priv, void (*reset_callback)(void *data));
asmlinkage void xmb_inject_err(void);
-# endif /* __ASSEMBLY__ */
+# endif /* __ASSEMBLER__ */
/* Error injection offset */
#define XMB_INJECT_ERR_OFFSET 0x200
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-06-10 7:26 ` Michal Simek
2025-06-10 13:19 ` Michal Simek
1 sibling, 0 replies; 94+ messages in thread
From: Michal Simek @ 2025-06-10 7:26 UTC (permalink / raw)
To: Thomas Huth, linux-kernel; +Cc: Arnd Bergmann, linux-arch
On 3/14/25 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: Michal Simek <monstr@monstr.eu>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/microblaze/include/asm/asm-compat.h | 2 +-
> arch/microblaze/include/asm/current.h | 4 ++--
> arch/microblaze/include/asm/entry.h | 4 ++--
> arch/microblaze/include/asm/exceptions.h | 4 ++--
> arch/microblaze/include/asm/fixmap.h | 4 ++--
> arch/microblaze/include/asm/ftrace.h | 2 +-
> arch/microblaze/include/asm/kgdb.h | 4 ++--
> arch/microblaze/include/asm/mmu.h | 4 ++--
> arch/microblaze/include/asm/page.h | 8 ++++----
> arch/microblaze/include/asm/pgtable.h | 18 +++++++++---------
> arch/microblaze/include/asm/processor.h | 8 ++++----
> arch/microblaze/include/asm/ptrace.h | 4 ++--
> arch/microblaze/include/asm/sections.h | 4 ++--
> arch/microblaze/include/asm/setup.h | 4 ++--
> arch/microblaze/include/asm/thread_info.h | 4 ++--
> arch/microblaze/include/asm/unistd.h | 4 ++--
> .../microblaze/include/asm/xilinx_mb_manager.h | 4 ++--
> 17 files changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/asm-compat.h b/arch/microblaze/include/asm/asm-compat.h
> index c05259ce2d2c2..9f04614762319 100644
> --- a/arch/microblaze/include/asm/asm-compat.h
> +++ b/arch/microblaze/include/asm/asm-compat.h
> @@ -4,7 +4,7 @@
>
> #include <asm/types.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
> # define stringify_in_c(...) __VA_ARGS__
> # define ASM_CONST(x) x
> #else
> diff --git a/arch/microblaze/include/asm/current.h b/arch/microblaze/include/asm/current.h
> index a4bb45be30e69..099e69f32bf97 100644
> --- a/arch/microblaze/include/asm/current.h
> +++ b/arch/microblaze/include/asm/current.h
> @@ -14,13 +14,13 @@
> * but check asm/microblaze/kernel/entry.S to be sure.
> */
> #define CURRENT_TASK r31
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> /*
> * Dedicate r31 to keeping the current task pointer
> */
> register struct task_struct *current asm("r31");
>
> # define get_current() current
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_CURRENT_H */
> diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h
> index 6c42bed411662..9efadf12397ca 100644
> --- a/arch/microblaze/include/asm/entry.h
> +++ b/arch/microblaze/include/asm/entry.h
> @@ -21,7 +21,7 @@
>
> #define PER_CPU(var) var
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */
> DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */
> DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */
> @@ -29,6 +29,6 @@ DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */
> DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */
>
> extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_ENTRY_H */
> diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h
> index 967f175173e14..c4591e4f7175b 100644
> --- a/arch/microblaze/include/asm/exceptions.h
> +++ b/arch/microblaze/include/asm/exceptions.h
> @@ -11,7 +11,7 @@
> #define _ASM_MICROBLAZE_EXCEPTIONS_H
>
> #ifdef __KERNEL__
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* Macros to enable and disable HW exceptions in the MSR */
> /* Define MSR enable bit for HW exceptions */
> @@ -64,6 +64,6 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig);
> void die(const char *str, struct pt_regs *fp, long err);
> void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
>
> -#endif /*__ASSEMBLY__ */
> +#endif /*__ASSEMBLER__ */
> #endif /* __KERNEL__ */
> #endif /* _ASM_MICROBLAZE_EXCEPTIONS_H */
> diff --git a/arch/microblaze/include/asm/fixmap.h b/arch/microblaze/include/asm/fixmap.h
> index e6e9288bff761..f9797849e4d43 100644
> --- a/arch/microblaze/include/asm/fixmap.h
> +++ b/arch/microblaze/include/asm/fixmap.h
> @@ -15,7 +15,7 @@
> #ifndef _ASM_FIXMAP_H
> #define _ASM_FIXMAP_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/kernel.h>
> #include <asm/page.h>
> #ifdef CONFIG_HIGHMEM
> @@ -62,5 +62,5 @@ extern void __set_fixmap(enum fixed_addresses idx,
>
> #include <asm-generic/fixmap.h>
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
> #endif
> diff --git a/arch/microblaze/include/asm/ftrace.h b/arch/microblaze/include/asm/ftrace.h
> index 4ca38b92a3a20..27c1bafb669c3 100644
> --- a/arch/microblaze/include/asm/ftrace.h
> +++ b/arch/microblaze/include/asm/ftrace.h
> @@ -7,7 +7,7 @@
> #define MCOUNT_ADDR ((unsigned long)(_mcount))
> #define MCOUNT_INSN_SIZE 8 /* sizeof mcount call */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern void _mcount(void);
> extern void ftrace_call_graph(void);
> void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr);
> diff --git a/arch/microblaze/include/asm/kgdb.h b/arch/microblaze/include/asm/kgdb.h
> index 8dc5ebb07fd5a..321c3c8bfcf27 100644
> --- a/arch/microblaze/include/asm/kgdb.h
> +++ b/arch/microblaze/include/asm/kgdb.h
> @@ -3,7 +3,7 @@
> #ifndef __MICROBLAZE_KGDB_H__
> #define __MICROBLAZE_KGDB_H__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define CACHE_FLUSH_IS_SAFE 1
> #define BUFMAX 2048
> @@ -27,6 +27,6 @@ static inline void arch_kgdb_breakpoint(void)
> struct pt_regs;
> asmlinkage void microblaze_kgdb_break(struct pt_regs *regs);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __MICROBLAZE_KGDB_H__ */
> #endif /* __KERNEL__ */
> diff --git a/arch/microblaze/include/asm/mmu.h b/arch/microblaze/include/asm/mmu.h
> index b928a87c00766..7262dc4da3385 100644
> --- a/arch/microblaze/include/asm/mmu.h
> +++ b/arch/microblaze/include/asm/mmu.h
> @@ -9,7 +9,7 @@
> #define _ASM_MICROBLAZE_MMU_H
>
> # ifdef __KERNEL__
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
>
> /* Default "unsigned long" context */
> typedef unsigned long mm_context_t;
> @@ -56,7 +56,7 @@ extern void _tlbia(void); /* invalidate all TLB entries */
> * mapping has to increase tlb_skip size.
> */
> extern u32 tlb_skip;
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /*
> * The MicroBlaze processor has a TLB architecture identical to PPC-40x. The
> diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h
> index 90fc9c81debda..90ac9f34b4b49 100644
> --- a/arch/microblaze/include/asm/page.h
> +++ b/arch/microblaze/include/asm/page.h
> @@ -25,7 +25,7 @@
>
> #define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * PAGE_OFFSET -- the first address of the first page of memory. With MMU
> @@ -100,7 +100,7 @@ extern int page_is_ram(unsigned long pfn);
> # define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
>
> # define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT)
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /* Convert between virtual and physical address for MMU. */
> /* Handle MicroBlaze processor with virtual memory. */
> @@ -113,7 +113,7 @@ extern int page_is_ram(unsigned long pfn);
> #define tovirt(rd, rs) \
> addik rd, rs, (CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> # define __pa(x) __virt_to_phys((unsigned long)(x))
> # define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
> @@ -130,7 +130,7 @@ static inline const void *pfn_to_virt(unsigned long pfn)
>
> #define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr)))
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #define TOPHYS(addr) __virt_to_phys(addr)
>
> diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h
> index e4ea2ec3642f0..eadc73d22dda6 100644
> --- a/arch/microblaze/include/asm/pgtable.h
> +++ b/arch/microblaze/include/asm/pgtable.h
> @@ -10,14 +10,14 @@
>
> #include <asm/setup.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern int mem_init_done;
> #endif
>
> #include <asm-generic/pgtable-nopmd.h>
>
> #ifdef __KERNEL__
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/sched.h>
> #include <linux/threads.h>
> @@ -39,7 +39,7 @@ extern pte_t *va_to_pte(unsigned long address);
> #define VMALLOC_START (CONFIG_KERNEL_START + CONFIG_LOWMEM_SIZE)
> #define VMALLOC_END ioremap_bot
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * Macro to mark a page protection value as "uncacheable".
> @@ -208,7 +208,7 @@ extern pte_t *va_to_pte(unsigned long address);
> * Also, write permissions imply read permissions.
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * ZERO_PAGE is a global shared page that is always zero: used
> * for zero-mapped memory areas etc..
> @@ -216,7 +216,7 @@ extern pte_t *va_to_pte(unsigned long address);
> extern unsigned long empty_zero_page[1024];
> #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #define pte_none(pte) ((pte_val(pte) & ~_PTE_NONE_MASK) == 0)
> #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT)
> @@ -237,7 +237,7 @@ extern unsigned long empty_zero_page[1024];
> #define pfn_pte(pfn, prot) \
> __pte(((pte_basic_t)(pfn) << PFN_PTE_SHIFT) | pgprot_val(prot))
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * The following only work if pte_present() is true.
> * Undefined behaviour if not..
> @@ -444,13 +444,13 @@ extern int mem_init_done;
>
> asmlinkage void __init mmu_init(void);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __KERNEL__ */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long ioremap_bot, ioremap_base;
>
> void setup_memory(void);
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_PGTABLE_H */
> diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
> index 4e193c7550dfa..d59bdfffca7cc 100644
> --- a/arch/microblaze/include/asm/processor.h
> +++ b/arch/microblaze/include/asm/processor.h
> @@ -14,7 +14,7 @@
> #include <asm/entry.h>
> #include <asm/current.h>
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> /* from kernel/cpu/mb.c */
> extern const struct seq_operations cpuinfo_op;
>
> @@ -29,7 +29,7 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);
> extern void ret_from_fork(void);
> extern void ret_from_kernel_thread(void);
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /*
> * This is used to define STACK_TOP, and with MMU it must be below
> @@ -45,7 +45,7 @@ extern void ret_from_kernel_thread(void);
>
> # define THREAD_KSP 0
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
>
> /* If you change this, you must change the associated assembly-languages
> * constants defined below, THREAD_*.
> @@ -88,5 +88,5 @@ unsigned long __get_wchan(struct task_struct *p);
> extern struct dentry *of_debugfs_root;
> #endif
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_PROCESSOR_H */
> diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h
> index bfcb89df5e26f..17982292a64fd 100644
> --- a/arch/microblaze/include/asm/ptrace.h
> +++ b/arch/microblaze/include/asm/ptrace.h
> @@ -7,7 +7,7 @@
>
> #include <uapi/asm/ptrace.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define kernel_mode(regs) ((regs)->pt_mode)
> #define user_mode(regs) (!kernel_mode(regs))
>
> @@ -20,5 +20,5 @@ static inline long regs_return_value(struct pt_regs *regs)
> return regs->r3;
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_PTRACE_H */
> diff --git a/arch/microblaze/include/asm/sections.h b/arch/microblaze/include/asm/sections.h
> index a9311ad84a67f..f5008f5e7a5c1 100644
> --- a/arch/microblaze/include/asm/sections.h
> +++ b/arch/microblaze/include/asm/sections.h
> @@ -10,11 +10,11 @@
>
> #include <asm-generic/sections.h>
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> extern char _ssbss[], _esbss[];
> extern unsigned long __ivt_start[], __ivt_end[];
>
> extern u32 _fdt_start[], _fdt_end[];
>
> -# endif /* !__ASSEMBLY__ */
> +# endif /* !__ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_SECTIONS_H */
> diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
> index bf2600f759593..837ed0bbae4b5 100644
> --- a/arch/microblaze/include/asm/setup.h
> +++ b/arch/microblaze/include/asm/setup.h
> @@ -9,7 +9,7 @@
>
> #include <uapi/asm/setup.h>
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> extern char cmd_line[COMMAND_LINE_SIZE];
>
> extern char *klimit;
> @@ -25,5 +25,5 @@ void machine_shutdown(void);
> void machine_halt(void);
> void machine_power_off(void);
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_SETUP_H */
> diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h
> index a0ddd2a36fb94..0153f7c2717c9 100644
> --- a/arch/microblaze/include/asm/thread_info.h
> +++ b/arch/microblaze/include/asm/thread_info.h
> @@ -13,7 +13,7 @@
> #define THREAD_SIZE (1 << THREAD_SHIFT)
> #define THREAD_SIZE_ORDER 1
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> # include <linux/types.h>
> # include <asm/processor.h>
>
> @@ -86,7 +86,7 @@ static inline struct thread_info *current_thread_info(void)
> }
>
> /* thread information allocation */
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * thread information flags
> diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
> index cfe3f888b432b..fedda9908aa94 100644
> --- a/arch/microblaze/include/asm/unistd.h
> +++ b/arch/microblaze/include/asm/unistd.h
> @@ -8,7 +8,7 @@
>
> #include <uapi/asm/unistd.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* #define __ARCH_WANT_OLD_READDIR */
> /* #define __ARCH_WANT_OLD_STAT */
> @@ -33,6 +33,6 @@
> #define __ARCH_WANT_SYS_VFORK
> #define __ARCH_WANT_SYS_FORK
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_UNISTD_H */
> diff --git a/arch/microblaze/include/asm/xilinx_mb_manager.h b/arch/microblaze/include/asm/xilinx_mb_manager.h
> index 7b6995722b0c0..121a3224882b2 100644
> --- a/arch/microblaze/include/asm/xilinx_mb_manager.h
> +++ b/arch/microblaze/include/asm/xilinx_mb_manager.h
> @@ -5,7 +5,7 @@
> #ifndef _XILINX_MB_MANAGER_H
> #define _XILINX_MB_MANAGER_H
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
>
> #include <linux/of_address.h>
>
> @@ -21,7 +21,7 @@ void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val,
> void *priv, void (*reset_callback)(void *data));
> asmlinkage void xmb_inject_err(void);
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /* Error injection offset */
> #define XMB_INJECT_ERR_OFFSET 0x200
$ git grep ASSEMBLY arch/microblaze/
arch/microblaze/include/uapi/asm/ptrace.h:13:#ifndef __ASSEMBLY__
arch/microblaze/include/uapi/asm/ptrace.h:71:#endif /* __ASSEMBLY__ */
This should be fixed too.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs
TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
2025-06-10 7:26 ` Michal Simek
@ 2025-06-10 13:19 ` Michal Simek
1 sibling, 0 replies; 94+ messages in thread
From: Michal Simek @ 2025-06-10 13:19 UTC (permalink / raw)
To: Thomas Huth, linux-kernel; +Cc: Arnd Bergmann, linux-arch
On 3/14/25 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: Michal Simek <monstr@monstr.eu>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/microblaze/include/asm/asm-compat.h | 2 +-
> arch/microblaze/include/asm/current.h | 4 ++--
> arch/microblaze/include/asm/entry.h | 4 ++--
> arch/microblaze/include/asm/exceptions.h | 4 ++--
> arch/microblaze/include/asm/fixmap.h | 4 ++--
> arch/microblaze/include/asm/ftrace.h | 2 +-
> arch/microblaze/include/asm/kgdb.h | 4 ++--
> arch/microblaze/include/asm/mmu.h | 4 ++--
> arch/microblaze/include/asm/page.h | 8 ++++----
> arch/microblaze/include/asm/pgtable.h | 18 +++++++++---------
> arch/microblaze/include/asm/processor.h | 8 ++++----
> arch/microblaze/include/asm/ptrace.h | 4 ++--
> arch/microblaze/include/asm/sections.h | 4 ++--
> arch/microblaze/include/asm/setup.h | 4 ++--
> arch/microblaze/include/asm/thread_info.h | 4 ++--
> arch/microblaze/include/asm/unistd.h | 4 ++--
> .../microblaze/include/asm/xilinx_mb_manager.h | 4 ++--
> 17 files changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/asm-compat.h b/arch/microblaze/include/asm/asm-compat.h
> index c05259ce2d2c2..9f04614762319 100644
> --- a/arch/microblaze/include/asm/asm-compat.h
> +++ b/arch/microblaze/include/asm/asm-compat.h
> @@ -4,7 +4,7 @@
>
> #include <asm/types.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
> # define stringify_in_c(...) __VA_ARGS__
> # define ASM_CONST(x) x
> #else
> diff --git a/arch/microblaze/include/asm/current.h b/arch/microblaze/include/asm/current.h
> index a4bb45be30e69..099e69f32bf97 100644
> --- a/arch/microblaze/include/asm/current.h
> +++ b/arch/microblaze/include/asm/current.h
> @@ -14,13 +14,13 @@
> * but check asm/microblaze/kernel/entry.S to be sure.
> */
> #define CURRENT_TASK r31
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> /*
> * Dedicate r31 to keeping the current task pointer
> */
> register struct task_struct *current asm("r31");
>
> # define get_current() current
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_CURRENT_H */
> diff --git a/arch/microblaze/include/asm/entry.h b/arch/microblaze/include/asm/entry.h
> index 6c42bed411662..9efadf12397ca 100644
> --- a/arch/microblaze/include/asm/entry.h
> +++ b/arch/microblaze/include/asm/entry.h
> @@ -21,7 +21,7 @@
>
> #define PER_CPU(var) var
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */
> DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */
> DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */
> @@ -29,6 +29,6 @@ DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */
> DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */
>
> extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_ENTRY_H */
> diff --git a/arch/microblaze/include/asm/exceptions.h b/arch/microblaze/include/asm/exceptions.h
> index 967f175173e14..c4591e4f7175b 100644
> --- a/arch/microblaze/include/asm/exceptions.h
> +++ b/arch/microblaze/include/asm/exceptions.h
> @@ -11,7 +11,7 @@
> #define _ASM_MICROBLAZE_EXCEPTIONS_H
>
> #ifdef __KERNEL__
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* Macros to enable and disable HW exceptions in the MSR */
> /* Define MSR enable bit for HW exceptions */
> @@ -64,6 +64,6 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig);
> void die(const char *str, struct pt_regs *fp, long err);
> void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
>
> -#endif /*__ASSEMBLY__ */
> +#endif /*__ASSEMBLER__ */
> #endif /* __KERNEL__ */
> #endif /* _ASM_MICROBLAZE_EXCEPTIONS_H */
> diff --git a/arch/microblaze/include/asm/fixmap.h b/arch/microblaze/include/asm/fixmap.h
> index e6e9288bff761..f9797849e4d43 100644
> --- a/arch/microblaze/include/asm/fixmap.h
> +++ b/arch/microblaze/include/asm/fixmap.h
> @@ -15,7 +15,7 @@
> #ifndef _ASM_FIXMAP_H
> #define _ASM_FIXMAP_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/kernel.h>
> #include <asm/page.h>
> #ifdef CONFIG_HIGHMEM
> @@ -62,5 +62,5 @@ extern void __set_fixmap(enum fixed_addresses idx,
>
> #include <asm-generic/fixmap.h>
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
> #endif
> diff --git a/arch/microblaze/include/asm/ftrace.h b/arch/microblaze/include/asm/ftrace.h
> index 4ca38b92a3a20..27c1bafb669c3 100644
> --- a/arch/microblaze/include/asm/ftrace.h
> +++ b/arch/microblaze/include/asm/ftrace.h
> @@ -7,7 +7,7 @@
> #define MCOUNT_ADDR ((unsigned long)(_mcount))
> #define MCOUNT_INSN_SIZE 8 /* sizeof mcount call */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern void _mcount(void);
> extern void ftrace_call_graph(void);
> void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr);
> diff --git a/arch/microblaze/include/asm/kgdb.h b/arch/microblaze/include/asm/kgdb.h
> index 8dc5ebb07fd5a..321c3c8bfcf27 100644
> --- a/arch/microblaze/include/asm/kgdb.h
> +++ b/arch/microblaze/include/asm/kgdb.h
> @@ -3,7 +3,7 @@
> #ifndef __MICROBLAZE_KGDB_H__
> #define __MICROBLAZE_KGDB_H__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define CACHE_FLUSH_IS_SAFE 1
> #define BUFMAX 2048
> @@ -27,6 +27,6 @@ static inline void arch_kgdb_breakpoint(void)
> struct pt_regs;
> asmlinkage void microblaze_kgdb_break(struct pt_regs *regs);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __MICROBLAZE_KGDB_H__ */
> #endif /* __KERNEL__ */
> diff --git a/arch/microblaze/include/asm/mmu.h b/arch/microblaze/include/asm/mmu.h
> index b928a87c00766..7262dc4da3385 100644
> --- a/arch/microblaze/include/asm/mmu.h
> +++ b/arch/microblaze/include/asm/mmu.h
> @@ -9,7 +9,7 @@
> #define _ASM_MICROBLAZE_MMU_H
>
> # ifdef __KERNEL__
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
>
> /* Default "unsigned long" context */
> typedef unsigned long mm_context_t;
> @@ -56,7 +56,7 @@ extern void _tlbia(void); /* invalidate all TLB entries */
> * mapping has to increase tlb_skip size.
> */
> extern u32 tlb_skip;
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /*
> * The MicroBlaze processor has a TLB architecture identical to PPC-40x. The
> diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h
> index 90fc9c81debda..90ac9f34b4b49 100644
> --- a/arch/microblaze/include/asm/page.h
> +++ b/arch/microblaze/include/asm/page.h
> @@ -25,7 +25,7 @@
>
> #define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * PAGE_OFFSET -- the first address of the first page of memory. With MMU
> @@ -100,7 +100,7 @@ extern int page_is_ram(unsigned long pfn);
> # define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
>
> # define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT)
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /* Convert between virtual and physical address for MMU. */
> /* Handle MicroBlaze processor with virtual memory. */
> @@ -113,7 +113,7 @@ extern int page_is_ram(unsigned long pfn);
> #define tovirt(rd, rs) \
> addik rd, rs, (CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> # define __pa(x) __virt_to_phys((unsigned long)(x))
> # define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
> @@ -130,7 +130,7 @@ static inline const void *pfn_to_virt(unsigned long pfn)
>
> #define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr)))
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #define TOPHYS(addr) __virt_to_phys(addr)
>
> diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h
> index e4ea2ec3642f0..eadc73d22dda6 100644
> --- a/arch/microblaze/include/asm/pgtable.h
> +++ b/arch/microblaze/include/asm/pgtable.h
> @@ -10,14 +10,14 @@
>
> #include <asm/setup.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern int mem_init_done;
> #endif
>
> #include <asm-generic/pgtable-nopmd.h>
>
> #ifdef __KERNEL__
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/sched.h>
> #include <linux/threads.h>
> @@ -39,7 +39,7 @@ extern pte_t *va_to_pte(unsigned long address);
> #define VMALLOC_START (CONFIG_KERNEL_START + CONFIG_LOWMEM_SIZE)
> #define VMALLOC_END ioremap_bot
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * Macro to mark a page protection value as "uncacheable".
> @@ -208,7 +208,7 @@ extern pte_t *va_to_pte(unsigned long address);
> * Also, write permissions imply read permissions.
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * ZERO_PAGE is a global shared page that is always zero: used
> * for zero-mapped memory areas etc..
> @@ -216,7 +216,7 @@ extern pte_t *va_to_pte(unsigned long address);
> extern unsigned long empty_zero_page[1024];
> #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #define pte_none(pte) ((pte_val(pte) & ~_PTE_NONE_MASK) == 0)
> #define pte_present(pte) (pte_val(pte) & _PAGE_PRESENT)
> @@ -237,7 +237,7 @@ extern unsigned long empty_zero_page[1024];
> #define pfn_pte(pfn, prot) \
> __pte(((pte_basic_t)(pfn) << PFN_PTE_SHIFT) | pgprot_val(prot))
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * The following only work if pte_present() is true.
> * Undefined behaviour if not..
> @@ -444,13 +444,13 @@ extern int mem_init_done;
>
> asmlinkage void __init mmu_init(void);
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __KERNEL__ */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long ioremap_bot, ioremap_base;
>
> void setup_memory(void);
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_PGTABLE_H */
> diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
> index 4e193c7550dfa..d59bdfffca7cc 100644
> --- a/arch/microblaze/include/asm/processor.h
> +++ b/arch/microblaze/include/asm/processor.h
> @@ -14,7 +14,7 @@
> #include <asm/entry.h>
> #include <asm/current.h>
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> /* from kernel/cpu/mb.c */
> extern const struct seq_operations cpuinfo_op;
>
> @@ -29,7 +29,7 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long usp);
> extern void ret_from_fork(void);
> extern void ret_from_kernel_thread(void);
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /*
> * This is used to define STACK_TOP, and with MMU it must be below
> @@ -45,7 +45,7 @@ extern void ret_from_kernel_thread(void);
>
> # define THREAD_KSP 0
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
>
> /* If you change this, you must change the associated assembly-languages
> * constants defined below, THREAD_*.
> @@ -88,5 +88,5 @@ unsigned long __get_wchan(struct task_struct *p);
> extern struct dentry *of_debugfs_root;
> #endif
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_PROCESSOR_H */
> diff --git a/arch/microblaze/include/asm/ptrace.h b/arch/microblaze/include/asm/ptrace.h
> index bfcb89df5e26f..17982292a64fd 100644
> --- a/arch/microblaze/include/asm/ptrace.h
> +++ b/arch/microblaze/include/asm/ptrace.h
> @@ -7,7 +7,7 @@
>
> #include <uapi/asm/ptrace.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define kernel_mode(regs) ((regs)->pt_mode)
> #define user_mode(regs) (!kernel_mode(regs))
>
> @@ -20,5 +20,5 @@ static inline long regs_return_value(struct pt_regs *regs)
> return regs->r3;
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_PTRACE_H */
> diff --git a/arch/microblaze/include/asm/sections.h b/arch/microblaze/include/asm/sections.h
> index a9311ad84a67f..f5008f5e7a5c1 100644
> --- a/arch/microblaze/include/asm/sections.h
> +++ b/arch/microblaze/include/asm/sections.h
> @@ -10,11 +10,11 @@
>
> #include <asm-generic/sections.h>
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> extern char _ssbss[], _esbss[];
> extern unsigned long __ivt_start[], __ivt_end[];
>
> extern u32 _fdt_start[], _fdt_end[];
>
> -# endif /* !__ASSEMBLY__ */
> +# endif /* !__ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_SECTIONS_H */
> diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
> index bf2600f759593..837ed0bbae4b5 100644
> --- a/arch/microblaze/include/asm/setup.h
> +++ b/arch/microblaze/include/asm/setup.h
> @@ -9,7 +9,7 @@
>
> #include <uapi/asm/setup.h>
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
> extern char cmd_line[COMMAND_LINE_SIZE];
>
> extern char *klimit;
> @@ -25,5 +25,5 @@ void machine_shutdown(void);
> void machine_halt(void);
> void machine_power_off(void);
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
> #endif /* _ASM_MICROBLAZE_SETUP_H */
> diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h
> index a0ddd2a36fb94..0153f7c2717c9 100644
> --- a/arch/microblaze/include/asm/thread_info.h
> +++ b/arch/microblaze/include/asm/thread_info.h
> @@ -13,7 +13,7 @@
> #define THREAD_SIZE (1 << THREAD_SHIFT)
> #define THREAD_SIZE_ORDER 1
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> # include <linux/types.h>
> # include <asm/processor.h>
>
> @@ -86,7 +86,7 @@ static inline struct thread_info *current_thread_info(void)
> }
>
> /* thread information allocation */
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /*
> * thread information flags
> diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
> index cfe3f888b432b..fedda9908aa94 100644
> --- a/arch/microblaze/include/asm/unistd.h
> +++ b/arch/microblaze/include/asm/unistd.h
> @@ -8,7 +8,7 @@
>
> #include <uapi/asm/unistd.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* #define __ARCH_WANT_OLD_READDIR */
> /* #define __ARCH_WANT_OLD_STAT */
> @@ -33,6 +33,6 @@
> #define __ARCH_WANT_SYS_VFORK
> #define __ARCH_WANT_SYS_FORK
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_MICROBLAZE_UNISTD_H */
> diff --git a/arch/microblaze/include/asm/xilinx_mb_manager.h b/arch/microblaze/include/asm/xilinx_mb_manager.h
> index 7b6995722b0c0..121a3224882b2 100644
> --- a/arch/microblaze/include/asm/xilinx_mb_manager.h
> +++ b/arch/microblaze/include/asm/xilinx_mb_manager.h
> @@ -5,7 +5,7 @@
> #ifndef _XILINX_MB_MANAGER_H
> #define _XILINX_MB_MANAGER_H
>
> -# ifndef __ASSEMBLY__
> +# ifndef __ASSEMBLER__
>
> #include <linux/of_address.h>
>
> @@ -21,7 +21,7 @@ void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val,
> void *priv, void (*reset_callback)(void *data));
> asmlinkage void xmb_inject_err(void);
>
> -# endif /* __ASSEMBLY__ */
> +# endif /* __ASSEMBLER__ */
>
> /* Error injection offset */
> #define XMB_INJECT_ERR_OFFSET 0x200
Applied.
M
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs
TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 19/41] mips: Replace __ASSEMBLY__ with __ASSEMBLER__ in the mips headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (17 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 18/41] microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-20 12:56 ` Philippe Mathieu-Daudé
2025-03-14 7:09 ` [PATCH 20/41] nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (21 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Thomas Bogendoerfer,
linux-mips
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 almost a completely mechanical patch (done with a simple
"sed -i" statement), with just one comment tweaked manually in
arch/mips/include/asm/cpu.h (that was missing some underscores).
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/mips/include/asm/addrspace.h | 4 +--
arch/mips/include/asm/asm-eva.h | 6 ++--
arch/mips/include/asm/asm.h | 8 ++---
arch/mips/include/asm/bmips.h | 4 +--
arch/mips/include/asm/cpu.h | 4 +--
arch/mips/include/asm/dec/ecc.h | 2 +-
arch/mips/include/asm/dec/interrupts.h | 4 +--
arch/mips/include/asm/dec/kn01.h | 2 +-
arch/mips/include/asm/dec/kn02.h | 2 +-
arch/mips/include/asm/dec/kn02xa.h | 2 +-
arch/mips/include/asm/eva.h | 4 +--
arch/mips/include/asm/ftrace.h | 4 +--
arch/mips/include/asm/hazards.h | 4 +--
arch/mips/include/asm/irqflags.h | 4 +--
arch/mips/include/asm/jazz.h | 16 ++++-----
arch/mips/include/asm/jump_label.h | 4 +--
arch/mips/include/asm/linkage.h | 2 +-
arch/mips/include/asm/mach-generic/spaces.h | 4 +--
arch/mips/include/asm/mips-boards/bonito64.h | 4 +--
arch/mips/include/asm/mipsmtregs.h | 6 ++--
arch/mips/include/asm/mipsregs.h | 6 ++--
arch/mips/include/asm/msa.h | 4 +--
arch/mips/include/asm/pci/bridge.h | 4 +--
arch/mips/include/asm/pm.h | 6 ++--
arch/mips/include/asm/prefetch.h | 2 +-
arch/mips/include/asm/regdef.h | 4 +--
arch/mips/include/asm/sibyte/board.h | 4 +--
arch/mips/include/asm/sibyte/sb1250.h | 2 +-
arch/mips/include/asm/sibyte/sb1250_defs.h | 6 ++--
arch/mips/include/asm/smp-cps.h | 6 ++--
arch/mips/include/asm/sn/addrs.h | 18 +++++-----
arch/mips/include/asm/sn/gda.h | 4 +--
arch/mips/include/asm/sn/kldir.h | 4 +--
arch/mips/include/asm/sn/klkernvars.h | 4 +--
arch/mips/include/asm/sn/launch.h | 4 +--
arch/mips/include/asm/sn/nmi.h | 8 ++---
arch/mips/include/asm/sn/sn0/addrs.h | 14 ++++----
arch/mips/include/asm/sn/sn0/hub.h | 2 +-
arch/mips/include/asm/sn/sn0/hubio.h | 36 ++++++++++----------
arch/mips/include/asm/sn/sn0/hubmd.h | 4 +--
arch/mips/include/asm/sn/sn0/hubni.h | 6 ++--
arch/mips/include/asm/sn/sn0/hubpi.h | 4 +--
arch/mips/include/asm/sn/types.h | 2 +-
arch/mips/include/asm/sync.h | 2 +-
arch/mips/include/asm/thread_info.h | 4 +--
arch/mips/include/asm/unistd.h | 4 +--
arch/mips/include/asm/vdso/gettimeofday.h | 4 +--
arch/mips/include/asm/vdso/processor.h | 4 +--
arch/mips/include/asm/vdso/vdso.h | 4 +--
arch/mips/include/asm/vdso/vsyscall.h | 4 +--
arch/mips/include/asm/xtalk/xtalk.h | 4 +--
arch/mips/include/asm/xtalk/xwidget.h | 4 +--
drivers/soc/bcm/brcmstb/pm/pm.h | 2 +-
53 files changed, 140 insertions(+), 140 deletions(-)
diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h
index 7e9ef01cb182b..e2354e9b0ee28 100644
--- a/arch/mips/include/asm/addrspace.h
+++ b/arch/mips/include/asm/addrspace.h
@@ -15,7 +15,7 @@
/*
* Configure language
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ATYPE_
#define _ATYPE32_
#define _ATYPE64_
@@ -34,7 +34,7 @@
/*
* 32-bit MIPS address spaces
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ACAST32_
#define _ACAST64_
#else
diff --git a/arch/mips/include/asm/asm-eva.h b/arch/mips/include/asm/asm-eva.h
index e327ebc767539..220431d00ee9b 100644
--- a/arch/mips/include/asm/asm-eva.h
+++ b/arch/mips/include/asm/asm-eva.h
@@ -10,7 +10,7 @@
#ifndef __ASM_ASM_EVA_H
#define __ASM_ASM_EVA_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Kernel variants */
@@ -99,7 +99,7 @@
#endif /* CONFIG_EVA */
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define kernel_cache(op, base) cache op, base
#define kernel_pref(hint, base) pref hint, base
@@ -185,6 +185,6 @@
#endif /* CONFIG_EVA */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_ASM_EVA_H */
diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h
index 87ff609b53fe1..0ed19ffed0769 100644
--- a/arch/mips/include/asm/asm.h
+++ b/arch/mips/include/asm/asm.h
@@ -37,7 +37,7 @@
#define CFI_SECTIONS
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* LEAF - declare leaf routine
*/
@@ -123,7 +123,7 @@ symbol = value
#define ASM_PRINT(string)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Stack alignment
@@ -228,7 +228,7 @@ symbol = value
#define LONG_INS ins
#define LONG_EXT ext
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define LONG .word
#endif
#define LONGSIZE 4
@@ -257,7 +257,7 @@ symbol = value
#define LONG_INS dins
#define LONG_EXT dext
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define LONG .dword
#endif
#define LONGSIZE 8
diff --git a/arch/mips/include/asm/bmips.h b/arch/mips/include/asm/bmips.h
index 3a1cdfddb987e..0eee81be9e2b5 100644
--- a/arch/mips/include/asm/bmips.h
+++ b/arch/mips/include/asm/bmips.h
@@ -42,7 +42,7 @@
#define ZSCM_REG_BASE 0x97000000
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#include <linux/cpumask.h>
#include <asm/r4kcache.h>
@@ -124,6 +124,6 @@ static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
barrier();
}
-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */
#endif /* _ASM_BMIPS_H */
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index ecb9854cb4324..32cf5496006e4 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -288,7 +288,7 @@
#define FPIR_IMP_NONE 0x0000
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
enum cpu_type_enum {
CPU_UNKNOWN,
@@ -329,7 +329,7 @@ enum cpu_type_enum {
CPU_LAST
};
-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
/*
* ISA Level encodings
diff --git a/arch/mips/include/asm/dec/ecc.h b/arch/mips/include/asm/dec/ecc.h
index c3a3f71f1a544..dbc39643c31c5 100644
--- a/arch/mips/include/asm/dec/ecc.h
+++ b/arch/mips/include/asm/dec/ecc.h
@@ -37,7 +37,7 @@
#define KN0X_ESR_SYNLO (0x7f<<0) /* syndrome from ECC logic */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/interrupt.h>
diff --git a/arch/mips/include/asm/dec/interrupts.h b/arch/mips/include/asm/dec/interrupts.h
index e10d341067c82..c1cd36c04b6c8 100644
--- a/arch/mips/include/asm/dec/interrupts.h
+++ b/arch/mips/include/asm/dec/interrupts.h
@@ -95,7 +95,7 @@
#define DEC_CPU_IRQ_ALL (0xff << CAUSEB_IP)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Interrupt table structures to hide differences between systems.
@@ -121,6 +121,6 @@ extern void cpu_all_int(void);
extern void dec_intr_unimplemented(void);
extern void asic_intr_unimplemented(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/mips/include/asm/dec/kn01.h b/arch/mips/include/asm/dec/kn01.h
index 88d9ffd742588..6c074b93a7dbf 100644
--- a/arch/mips/include/asm/dec/kn01.h
+++ b/arch/mips/include/asm/dec/kn01.h
@@ -71,7 +71,7 @@
#define KN01_CSR_LEDS (0xff<<0) /* ~diagnostic LEDs (w/o) */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/interrupt.h>
#include <linux/spinlock.h>
diff --git a/arch/mips/include/asm/dec/kn02.h b/arch/mips/include/asm/dec/kn02.h
index 93430b5f47241..9fea17020079d 100644
--- a/arch/mips/include/asm/dec/kn02.h
+++ b/arch/mips/include/asm/dec/kn02.h
@@ -80,7 +80,7 @@
#define KN02_IRQ_ALL 0xff
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
diff --git a/arch/mips/include/asm/dec/kn02xa.h b/arch/mips/include/asm/dec/kn02xa.h
index b56b4577f6eff..3580d78b906fb 100644
--- a/arch/mips/include/asm/dec/kn02xa.h
+++ b/arch/mips/include/asm/dec/kn02xa.h
@@ -70,7 +70,7 @@
#define KN02XA_EAR_RES_0 (0x3<<0) /* unused */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/interrupt.h>
diff --git a/arch/mips/include/asm/eva.h b/arch/mips/include/asm/eva.h
index a3d1807f227c2..c7b39f38634b8 100644
--- a/arch/mips/include/asm/eva.h
+++ b/arch/mips/include/asm/eva.h
@@ -13,7 +13,7 @@
#include <kernel-entry-init.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_EVA
@@ -38,6 +38,6 @@ platform_eva_init
#endif /* CONFIG_EVA */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/mips/include/asm/ftrace.h b/arch/mips/include/asm/ftrace.h
index dc025888f6d28..55d32cdeba4f3 100644
--- a/arch/mips/include/asm/ftrace.h
+++ b/arch/mips/include/asm/ftrace.h
@@ -15,7 +15,7 @@
#define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void _mcount(void);
#define mcount _mcount
@@ -89,6 +89,6 @@ struct dyn_arch_ftrace {
void prepare_ftrace_return(unsigned long *parent_ra_addr, unsigned long self_ra,
unsigned long fp);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_FUNCTION_TRACER */
#endif /* _ASM_MIPS_FTRACE_H */
diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h
index cb16be93b048e..a084b3b3bc810 100644
--- a/arch/mips/include/asm/hazards.h
+++ b/arch/mips/include/asm/hazards.h
@@ -301,7 +301,7 @@ do { \
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ssnop ___ssnop
#define _ehb ___ehb
@@ -417,6 +417,6 @@ do { \
*/
extern void mips_ihb(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_HAZARDS_H */
diff --git a/arch/mips/include/asm/irqflags.h b/arch/mips/include/asm/irqflags.h
index f5b8300f45735..70e5b05fd88bd 100644
--- a/arch/mips/include/asm/irqflags.h
+++ b/arch/mips/include/asm/irqflags.h
@@ -11,7 +11,7 @@
#ifndef _ASM_IRQFLAGS_H
#define _ASM_IRQFLAGS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/stringify.h>
@@ -142,7 +142,7 @@ static inline int arch_irqs_disabled(void)
return arch_irqs_disabled_flags(arch_local_save_flags());
}
-#endif /* #ifndef __ASSEMBLY__ */
+#endif /* #ifndef __ASSEMBLER__ */
/*
* Do the CPU's IRQ-state tracing from assembly code.
diff --git a/arch/mips/include/asm/jazz.h b/arch/mips/include/asm/jazz.h
index a61970d01a81c..9356e87dd64be 100644
--- a/arch/mips/include/asm/jazz.h
+++ b/arch/mips/include/asm/jazz.h
@@ -70,7 +70,7 @@
#define LED_E 0x9e
#define LED_F 0x8e
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static __inline__ void pica_set_led(unsigned int bits)
{
@@ -79,7 +79,7 @@ static __inline__ void pica_set_led(unsigned int bits)
*led_register = bits;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Base address of the Sonic Ethernet adapter in Jazz machines.
@@ -100,7 +100,7 @@ static __inline__ void pica_set_led(unsigned int bits)
#define JAZZ_KEYBOARD_DATA 0xe0005000
#define JAZZ_KEYBOARD_COMMAND 0xe0005001
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
unsigned char data;
@@ -121,7 +121,7 @@ typedef struct {
*/
#define keyboard_hardware jazz_keyboard_hardware
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* i8042 keyboard controller for most other Mips machines.
@@ -154,7 +154,7 @@ typedef struct {
/*
* DRAM configuration register
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __MIPSEL__
typedef struct {
unsigned int bank2 : 3;
@@ -174,7 +174,7 @@ typedef struct {
unsigned int bank2 : 3;
} dram_configuration;
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define PICA_DRAM_CONFIG 0xe00fffe0
@@ -260,7 +260,7 @@ typedef struct {
/*
* Access the R4030 DMA and I/O Controller
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void r4030_delay(void)
{
@@ -299,7 +299,7 @@ static inline void r4030_write_reg32(unsigned long addr, unsigned val)
r4030_delay();
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define JAZZ_FDC_BASE 0xe0003000
#define JAZZ_RTC_BASE 0xe0004000
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h
index ff5d388502d4a..c1508f88e03ea 100644
--- a/arch/mips/include/asm/jump_label.h
+++ b/arch/mips/include/asm/jump_label.h
@@ -10,7 +10,7 @@
#define arch_jump_label_transform_static arch_jump_label_transform
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/isa-rev.h>
@@ -76,5 +76,5 @@ struct jump_entry {
jump_label_t key;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_MIPS_JUMP_LABEL_H */
diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h
index 1829c2b6da6cd..fd44ba754f1a6 100644
--- a/arch/mips/include/asm/linkage.h
+++ b/arch/mips/include/asm/linkage.h
@@ -2,7 +2,7 @@
#ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm.h>
#endif
diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h
index f8783d339fb0d..6332b6cbf7eef 100644
--- a/arch/mips/include/asm/mach-generic/spaces.h
+++ b/arch/mips/include/asm/mach-generic/spaces.h
@@ -21,13 +21,13 @@
/*
* This gives the physical RAM offset.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# if defined(CONFIG_MIPS_AUTO_PFN_OFFSET)
# define PHYS_OFFSET ((unsigned long)PFN_PHYS(ARCH_PFN_OFFSET))
# elif !defined(PHYS_OFFSET)
# define PHYS_OFFSET _AC(0, UL)
# endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_32BIT
#define CAC_BASE _AC(0x80000000, UL)
diff --git a/arch/mips/include/asm/mips-boards/bonito64.h b/arch/mips/include/asm/mips-boards/bonito64.h
index 31a31fe78d775..74c5fc0fc6c04 100644
--- a/arch/mips/include/asm/mips-boards/bonito64.h
+++ b/arch/mips/include/asm/mips-boards/bonito64.h
@@ -21,7 +21,7 @@
#ifndef _ASM_MIPS_BOARDS_BONITO64_H
#define _ASM_MIPS_BOARDS_BONITO64_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* offsets from base register */
#define BONITO(x) (x)
@@ -36,7 +36,7 @@ extern unsigned long _pcictrl_bonito_pcicfg;
#define BONITO(x) *(volatile u32 *)(_pcictrl_bonito + (x))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define BONITO_BOOT_BASE 0x1fc00000
diff --git a/arch/mips/include/asm/mipsmtregs.h b/arch/mips/include/asm/mipsmtregs.h
index b1ee3c48e84ba..cab7582010e80 100644
--- a/arch/mips/include/asm/mipsmtregs.h
+++ b/arch/mips/include/asm/mipsmtregs.h
@@ -10,7 +10,7 @@
#include <asm/mipsregs.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* C macros
@@ -176,7 +176,7 @@
/* TCHalt */
#define TCHALT_H (_ULCAST_(1))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline unsigned core_nvpes(void)
{
@@ -469,6 +469,6 @@ do { \
__BUILD_SET_C0(mvpcontrol)
-#endif /* Not __ASSEMBLY__ */
+#endif /* Not __ASSEMBLER__ */
#endif
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index c025558754d57..f799c0d723dac 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -32,7 +32,7 @@
/*
* Configure language
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ULCAST_
#define _U64CAST_
#else
@@ -1346,7 +1346,7 @@
#define FPU_CSR_RD 0x3 /* towards -Infinity */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Macros for handling the ISA mode bit for MIPS16 and microMIPS.
@@ -3095,6 +3095,6 @@ static inline unsigned int get_ebase_cpunum(void)
return read_c0_ebase() & MIPS_EBASE_CPUNUM;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_MIPSREGS_H */
diff --git a/arch/mips/include/asm/msa.h b/arch/mips/include/asm/msa.h
index 236a49ee2e3e7..c6077f5fa4b18 100644
--- a/arch/mips/include/asm/msa.h
+++ b/arch/mips/include/asm/msa.h
@@ -8,7 +8,7 @@
#include <asm/mipsregs.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/inst.h>
@@ -218,7 +218,7 @@ __BUILD_MSA_CTL_REG(request, 5)
__BUILD_MSA_CTL_REG(map, 6)
__BUILD_MSA_CTL_REG(unmap, 7)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define MSA_IR 0
#define MSA_CSR 1
diff --git a/arch/mips/include/asm/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h
index 9c476a0400e0c..eaeafccd82c7d 100644
--- a/arch/mips/include/asm/pci/bridge.h
+++ b/arch/mips/include/asm/pci/bridge.h
@@ -43,7 +43,7 @@
* Bridge address map
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define ATE_V 0x01
#define ATE_CO 0x02
@@ -288,7 +288,7 @@ struct bridge_err_cmdword {
};
#define berr_field berr_un.berr_st
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* The values of these macros can and should be crosschecked
diff --git a/arch/mips/include/asm/pm.h b/arch/mips/include/asm/pm.h
index 7ecd4dfe38461..52f3d64c5f347 100644
--- a/arch/mips/include/asm/pm.h
+++ b/arch/mips/include/asm/pm.h
@@ -8,7 +8,7 @@
#ifndef __ASM_PM_H
#define __ASM_PM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#include <asm/asm.h>
@@ -130,7 +130,7 @@
RESUME_RESTORE_REGS_RETURN
.endm
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/**
* struct mips_static_suspend_state - Core saved CPU state across S2R.
@@ -150,6 +150,6 @@ struct mips_static_suspend_state {
unsigned long sp;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_PM_HELPERS_H */
diff --git a/arch/mips/include/asm/prefetch.h b/arch/mips/include/asm/prefetch.h
index a56594f360ee2..4bd359fa3d977 100644
--- a/arch/mips/include/asm/prefetch.h
+++ b/arch/mips/include/asm/prefetch.h
@@ -42,7 +42,7 @@
#define Pref_WriteBackInvalidate 25
#define Pref_PrepareForStore 30
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro __pref hint addr
#ifdef CONFIG_CPU_HAS_PREFETCH
diff --git a/arch/mips/include/asm/regdef.h b/arch/mips/include/asm/regdef.h
index 236051364f78e..dd0b558c97672 100644
--- a/arch/mips/include/asm/regdef.h
+++ b/arch/mips/include/asm/regdef.h
@@ -103,7 +103,7 @@
#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#if _MIPS_SIM == _MIPS_SIM_ABI32
/*
@@ -192,6 +192,6 @@
#define ra $31 /* return address */
#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_REGDEF_H */
diff --git a/arch/mips/include/asm/sibyte/board.h b/arch/mips/include/asm/sibyte/board.h
index 03463faa42446..d29c1c013dc5c 100644
--- a/arch/mips/include/asm/sibyte/board.h
+++ b/arch/mips/include/asm/sibyte/board.h
@@ -19,7 +19,7 @@
#include <asm/sibyte/bigsur.h>
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef LEDS_PHYS
#define setleds(t0, t1, c0, c1, c2, c3) \
@@ -46,6 +46,6 @@ extern void setleds(char *str);
#define setleds(s) do { } while (0)
#endif /* LEDS_PHYS */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _SIBYTE_BOARD_H */
diff --git a/arch/mips/include/asm/sibyte/sb1250.h b/arch/mips/include/asm/sibyte/sb1250.h
index 495b31925ed77..de4b352256c8a 100644
--- a/arch/mips/include/asm/sibyte/sb1250.h
+++ b/arch/mips/include/asm/sibyte/sb1250.h
@@ -19,7 +19,7 @@
#define SB1250_DUART_MINOR_BASE 64
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/addrspace.h>
diff --git a/arch/mips/include/asm/sibyte/sb1250_defs.h b/arch/mips/include/asm/sibyte/sb1250_defs.h
index 68cd7c0b37eae..98cbb65cce0ac 100644
--- a/arch/mips/include/asm/sibyte/sb1250_defs.h
+++ b/arch/mips/include/asm/sibyte/sb1250_defs.h
@@ -199,7 +199,7 @@
* Note: you'll need to define uint32_t and uint64_t in your headers.
*/
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#define _SB_MAKE64(x) ((uint64_t)(x))
#define _SB_MAKE32(x) ((uint32_t)(x))
#else
@@ -238,9 +238,9 @@
*/
-#if defined(__mips64) && !defined(__ASSEMBLY__)
+#if defined(__mips64) && !defined(__ASSEMBLER__)
#define SBWRITECSR(csr, val) *((volatile uint64_t *) PHYS_TO_K1(csr)) = (val)
#define SBREADCSR(csr) (*((volatile uint64_t *) PHYS_TO_K1(csr)))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/mips/include/asm/smp-cps.h b/arch/mips/include/asm/smp-cps.h
index ab94e50f62b87..d80a629a71f95 100644
--- a/arch/mips/include/asm/smp-cps.h
+++ b/arch/mips/include/asm/smp-cps.h
@@ -9,7 +9,7 @@
#define CPS_ENTRY_PATCH_INSNS 6
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct vpe_boot_config {
unsigned long pc;
@@ -49,9 +49,9 @@ static inline bool mips_cps_smp_in_use(void) { return false; }
#endif /* !CONFIG_MIPS_CPS */
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
.extern mips_cps_bootcfg;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __MIPS_ASM_SMP_CPS_H__ */
diff --git a/arch/mips/include/asm/sn/addrs.h b/arch/mips/include/asm/sn/addrs.h
index 837d23e249768..7c675fecbf9a9 100644
--- a/arch/mips/include/asm/sn/addrs.h
+++ b/arch/mips/include/asm/sn/addrs.h
@@ -10,10 +10,10 @@
#define _ASM_SN_ADDRS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/smp.h>
#include <linux/types.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#include <asm/addrspace.h>
#include <asm/sn/kldir.h>
@@ -25,15 +25,15 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define UINT64_CAST (unsigned long)
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define UINT64_CAST
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define NASID_GET_META(_n) ((_n) >> NASID_LOCAL_BITS)
@@ -254,7 +254,7 @@
#define LOCAL_HUB_ADDR(_x) (IALIAS_BASE + (_x))
#define REMOTE_HUB_ADDR(_n, _x) ((NODE_SWIN_BASE(_n, 1) + 0x800000 + (_x)))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define LOCAL_HUB_PTR(_x) ((u64 *)LOCAL_HUB_ADDR((_x)))
#define REMOTE_HUB_PTR(_n, _x) ((u64 *)REMOTE_HUB_ADDR((_n), (_x)))
@@ -265,7 +265,7 @@
#define REMOTE_HUB_S(_n, _r, _d) __raw_writeq((_d), \
REMOTE_HUB_PTR((_n), (_r)))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Software structure locations -- permanently fixed
@@ -315,7 +315,7 @@
#define KLI_KERN_XP 8
#define KLI_KERN_PARTID 9
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define KLD_BASE(nasid) ((kldir_ent_t *) KLDIR_ADDR(nasid))
#define KLD_LAUNCH(nasid) (KLD_BASE(nasid) + KLI_LAUNCH)
@@ -371,7 +371,7 @@
#define KERN_VARS_ADDR(nasid) KLD_KERN_VARS(nasid)->pointer
#define KERN_VARS_SIZE(nasid) KLD_KERN_VARS(nasid)->size
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_SN_ADDRS_H */
diff --git a/arch/mips/include/asm/sn/gda.h b/arch/mips/include/asm/sn/gda.h
index 5b8c96d5b5870..d8fd80137206a 100644
--- a/arch/mips/include/asm/sn/gda.h
+++ b/arch/mips/include/asm/sn/gda.h
@@ -39,7 +39,7 @@
#define G_PARTIDOFF 40
#define G_TABLEOFF 128
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct gda {
u32 g_magic; /* GDA magic number */
@@ -63,7 +63,7 @@ typedef struct gda {
#define GDA ((gda_t*) GDA_ADDR(get_nasid()))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Define: PART_GDA_VERSION
* Purpose: Define the minimum version of the GDA required, lower
diff --git a/arch/mips/include/asm/sn/kldir.h b/arch/mips/include/asm/sn/kldir.h
index 245f59bf38454..f394b1e0c9566 100644
--- a/arch/mips/include/asm/sn/kldir.h
+++ b/arch/mips/include/asm/sn/kldir.h
@@ -15,7 +15,7 @@
#define KLDIR_ENT_SIZE 0x40
#define KLDIR_MAX_ENTRIES (0x400 / 0x40)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct kldir_ent_s {
u64 magic; /* Indicates validity of entry */
off_t offset; /* Offset from start of node space */
@@ -27,7 +27,7 @@ typedef struct kldir_ent_s {
/* NOTE: These 16 bytes are used in the Partition KLDIR
entry to store partition info. Refer to klpart.h for this. */
} kldir_ent_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_SGI_IP27
#include <asm/sn/sn0/kldir.h>
diff --git a/arch/mips/include/asm/sn/klkernvars.h b/arch/mips/include/asm/sn/klkernvars.h
index ea6b217951636..bb7a6c36f6e7b 100644
--- a/arch/mips/include/asm/sn/klkernvars.h
+++ b/arch/mips/include/asm/sn/klkernvars.h
@@ -12,7 +12,7 @@
#define KV_MAGIC 0x5f4b565f
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/sn/types.h>
@@ -24,6 +24,6 @@ typedef struct kern_vars_s {
unsigned long kv_rw_baseaddr;
} kern_vars_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_SN_KLKERNVARS_H */
diff --git a/arch/mips/include/asm/sn/launch.h b/arch/mips/include/asm/sn/launch.h
index 04226d8d30c42..ce95187362e70 100644
--- a/arch/mips/include/asm/sn/launch.h
+++ b/arch/mips/include/asm/sn/launch.h
@@ -59,7 +59,7 @@
* clears the BUSY flag after control is returned to it.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef int launch_state_t;
typedef void (*launch_proc_t)(u64 call_parm);
@@ -101,6 +101,6 @@ typedef struct launch_s {
#define LAUNCH_FLASH (*(void (*)(void)) \
IP27PROM_FLASHLEDS)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_SN_LAUNCH_H */
diff --git a/arch/mips/include/asm/sn/nmi.h b/arch/mips/include/asm/sn/nmi.h
index 12ac210f12a17..eff51606bbcea 100644
--- a/arch/mips/include/asm/sn/nmi.h
+++ b/arch/mips/include/asm/sn/nmi.h
@@ -48,7 +48,7 @@
*
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct nmi_s {
volatile unsigned long magic; /* Magic number */
@@ -59,13 +59,13 @@ typedef struct nmi_s {
volatile unsigned long gmaster; /* Flag true only on global master*/
} nmi_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Following definitions are needed both in the prom & the kernel
* to identify the format of the nmi cpu register save area in the
* low memory on each node.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct reg_struct {
unsigned long gpr[32];
@@ -78,7 +78,7 @@ struct reg_struct {
unsigned long nmi_sr;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* These are the assembly language offsets into the reg_struct structure */
diff --git a/arch/mips/include/asm/sn/sn0/addrs.h b/arch/mips/include/asm/sn/sn0/addrs.h
index f13df84edfdd5..a28158a91ecf5 100644
--- a/arch/mips/include/asm/sn/sn0/addrs.h
+++ b/arch/mips/include/asm/sn/sn0/addrs.h
@@ -84,15 +84,15 @@
#define NASID_GET(_pa) (int) ((UINT64_CAST (_pa) >> \
NASID_SHFT) & NASID_BITMASK)
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#define NODE_SWIN_BASE(nasid, widget) \
((widget == 0) ? NODE_BWIN_BASE((nasid), SWIN0_BIGWIN) \
: RAW_NODE_SWIN_BASE(nasid, widget))
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define NODE_SWIN_BASE(nasid, widget) \
(NODE_IO_BASE(nasid) + (UINT64_CAST(widget) << SWIN_SIZE_BITS))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* The following definitions pertain to the IO special address
@@ -139,11 +139,11 @@
/* Turn on sable logging for the processors whose bits are set. */
#define SABLE_LOG_TRIGGER(_map)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define KERN_NMI_ADDR(nasid, slice) \
TO_NODE_UNCAC((nasid), IP27_NMI_KREGS_OFFSET + \
(IP27_NMI_KREGS_CPU_SIZE * (slice)))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef PROM
@@ -248,7 +248,7 @@
#define KL_UART_DATA LOCAL_HUB_ADDR(MD_UREG0_1) /* UART data reg */
#define KL_I2C_REG MD_UREG0_0 /* I2C reg */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Address 0x400 to 0x1000 ualias points to cache error eframe + misc
* CACHE_ERR_SP_PTR could either contain an address to the stack, or
@@ -266,7 +266,7 @@
#define CACHE_ERR_SP (CACHE_ERR_SP_PTR - 16)
#define CACHE_ERR_AREA_SIZE (ARCS_SPB_OFFSET - CACHE_ERR_EFRAME)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define _ARCSPROM
diff --git a/arch/mips/include/asm/sn/sn0/hub.h b/arch/mips/include/asm/sn/sn0/hub.h
index c84adde36d41f..916394319af59 100644
--- a/arch/mips/include/asm/sn/sn0/hub.h
+++ b/arch/mips/include/asm/sn/sn0/hub.h
@@ -37,7 +37,7 @@
#define UATTR_MSPEC 2
#define UATTR_UNCAC 3
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* Returns the local nasid into res.
*/
diff --git a/arch/mips/include/asm/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h
index 57ece90f8cf1e..c489426f8f9e2 100644
--- a/arch/mips/include/asm/sn/sn0/hubio.h
+++ b/arch/mips/include/asm/sn/sn0/hubio.h
@@ -169,7 +169,7 @@
/*
* The IO LLP control status register and widget control register
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union hubii_wid_u {
u64 wid_reg_value;
@@ -292,7 +292,7 @@ typedef union io_perf_cnt {
} perf_cnt_bits;
} io_perf_cnt_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define LNK_STAT_WORKING 0x2
@@ -440,7 +440,7 @@ typedef union io_perf_cnt {
/*
* Fields in CRB Register A
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union icrba_u {
u64 reg_value;
struct {
@@ -486,7 +486,7 @@ typedef union h1_icrba_u {
#define ICRBN_A_CERR_SHFT 54
#define ICRBN_A_ERR_MASK 0x3ff
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define IIO_ICRB_ADDR_SHFT 2 /* Shift to get proper address */
@@ -509,7 +509,7 @@ typedef union h1_icrba_u {
/*
* Fields in CRB Register B
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union icrbb_u {
u64 reg_value;
struct {
@@ -608,7 +608,7 @@ typedef union h1_icrbb_u {
#define b_imsg icrbb_field_s.imsg
#define b_initiator icrbb_field_s.initiator
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* values for field xtsize
@@ -666,7 +666,7 @@ typedef union h1_icrbb_u {
* Fields in CRB Register C
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union icrbc_s {
u64 reg_value;
@@ -698,13 +698,13 @@ typedef union icrbc_s {
#define c_barrop icrbc_field_s.barrop
#define c_doresp icrbc_field_s.doresp
#define c_gbr icrbc_field_s.gbr
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Fields in CRB Register D
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union icrbd_s {
u64 reg_value;
struct {
@@ -737,7 +737,7 @@ typedef union hubii_ifdr_u {
} hi_ifdr_fields;
} hubii_ifdr_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Hardware designed names for the BTE control registers.
@@ -784,7 +784,7 @@ typedef union hubii_ifdr_u {
* IO PIO Read Table Entry format
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union iprte_a {
u64 entry;
@@ -806,7 +806,7 @@ typedef union iprte_a {
#define iprte_init iprte_fields.initiator
#define iprte_addr iprte_fields.addr
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define IPRTE_ADDRSHFT 3
@@ -814,7 +814,7 @@ typedef union iprte_a {
* Hub IIO PRB Register format.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Note: Fields bnakctr, anakctr, xtalkctrmode, ovflow fields are
* "Status" fields, and should only be used in case of clean up after errors.
@@ -846,7 +846,7 @@ typedef union iprb_u {
#define iprb_anakctr iprb_fields_s.anakctr
#define iprb_xtalkctr iprb_fields_s.xtalkctr
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* values for mode field in iprb_t.
@@ -861,7 +861,7 @@ typedef union iprb_u {
/*
* IO CRB entry C_A to E_A : Partial (cache) CRBS
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union icrbp_a {
u64 ip_reg; /* the entire register value */
struct {
@@ -895,7 +895,7 @@ typedef union icrbp_a {
} ip_fmt;
} icrbp_a_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* A couple of defines to go with the above structure.
@@ -903,7 +903,7 @@ typedef union icrbp_a {
#define ICRBP_A_CERR_SHFT 54
#define ICRBP_A_ERR_MASK 0x3ff
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union hubii_idsr {
u64 iin_reg;
struct {
@@ -917,7 +917,7 @@ typedef union hubii_idsr {
level : 7;
} iin_fmt;
} hubii_idsr_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* IO BTE Length/Status (IIO_IBLS) register bit field definitions
diff --git a/arch/mips/include/asm/sn/sn0/hubmd.h b/arch/mips/include/asm/sn/sn0/hubmd.h
index 305d002be1825..97d9cbbf9f4c6 100644
--- a/arch/mips/include/asm/sn/sn0/hubmd.h
+++ b/arch/mips/include/asm/sn/sn0/hubmd.h
@@ -423,7 +423,7 @@
* Operations on page migration threshold register
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* LED register macros
@@ -735,7 +735,7 @@ typedef union md_perf_cnt {
} md_perf_cnt_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define DIR_ERROR_VALID_MASK 0xe000000000000000
diff --git a/arch/mips/include/asm/sn/sn0/hubni.h b/arch/mips/include/asm/sn/sn0/hubni.h
index b8253142cb834..4830bae723e4b 100644
--- a/arch/mips/include/asm/sn/sn0/hubni.h
+++ b/arch/mips/include/asm/sn/sn0/hubni.h
@@ -11,7 +11,7 @@
#ifndef _ASM_SGI_SN0_HUBNI_H
#define _ASM_SGI_SN0_HUBNI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#endif
@@ -226,7 +226,7 @@
#define NLT_EXIT_PORT_MASK (UINT64_CAST 0xf)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef union hubni_port_error_u {
u64 nipe_reg_value;
@@ -258,6 +258,6 @@ static inline int get_region_shift(void)
return NASID_TO_COARSEREG_SHFT;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_SGI_SN0_HUBNI_H */
diff --git a/arch/mips/include/asm/sn/sn0/hubpi.h b/arch/mips/include/asm/sn/sn0/hubpi.h
index 7b83655913c52..a4fe0feeef0cc 100644
--- a/arch/mips/include/asm/sn/sn0/hubpi.h
+++ b/arch/mips/include/asm/sn/sn0/hubpi.h
@@ -306,7 +306,7 @@
#define ERR_STACK_SIZE_BYTES(_sz) \
((_sz) ? (PI_MIN_STACK_SIZE << ((_sz) - 1)) : 0)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* format of error stack and error status registers.
*/
@@ -359,7 +359,7 @@ typedef union pi_err_stat1 {
typedef u64 rtc_time_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Bits in PI_SYSAD_ERRCHK_EN */
diff --git a/arch/mips/include/asm/sn/types.h b/arch/mips/include/asm/sn/types.h
index 451ba1ee41ad8..53d04c04d6f55 100644
--- a/arch/mips/include/asm/sn/types.h
+++ b/arch/mips/include/asm/sn/types.h
@@ -11,7 +11,7 @@
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef unsigned long cpuid_t;
typedef signed short nasid_t; /* node id in numa-as-id space */
diff --git a/arch/mips/include/asm/sync.h b/arch/mips/include/asm/sync.h
index 44c04a82d0b7d..d7873e8d7e6f8 100644
--- a/arch/mips/include/asm/sync.h
+++ b/arch/mips/include/asm/sync.h
@@ -193,7 +193,7 @@
* Preprocessor magic to expand macros used as arguments before we insert them
* into assembly code.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define ___SYNC(type, reason, else) \
____SYNC(type, reason, else)
#else
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index b9d76e8ac5a23..2707dad260dd7 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -11,7 +11,7 @@
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
@@ -73,7 +73,7 @@ static inline struct thread_info *current_thread_info(void)
register unsigned long current_stack_pointer __asm__("sp");
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* thread information allocation */
#if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_32BIT)
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index ba83d3fb0a848..6a974b990f4b2 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -29,7 +29,7 @@
#define NR_syscalls (__NR_O32_Linux + __NR_O32_Linux_syscalls)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __ARCH_WANT_NEW_STAT
#define __ARCH_WANT_OLD_READDIR
@@ -62,6 +62,6 @@
/* whitelists for checksyscalls */
#define __IGNORE_fadvise64_64
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_UNISTD_H */
diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
index 44a45f3fa4b01..e69bf35006625 100644
--- a/arch/mips/include/asm/vdso/gettimeofday.h
+++ b/arch/mips/include/asm/vdso/gettimeofday.h
@@ -11,7 +11,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/vdso/vdso.h>
#include <asm/clocksource.h>
@@ -214,6 +214,6 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void)
return get_vdso_data();
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/mips/include/asm/vdso/processor.h b/arch/mips/include/asm/vdso/processor.h
index 511c95d735e65..05cdb366dc21c 100644
--- a/arch/mips/include/asm/vdso/processor.h
+++ b/arch/mips/include/asm/vdso/processor.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_CPU_LOONGSON64
/*
@@ -22,6 +22,6 @@
#define cpu_relax() barrier()
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/mips/include/asm/vdso/vdso.h b/arch/mips/include/asm/vdso/vdso.h
index 6cd88191fefa9..1cbe6aca73201 100644
--- a/arch/mips/include/asm/vdso/vdso.h
+++ b/arch/mips/include/asm/vdso/vdso.h
@@ -6,7 +6,7 @@
#include <asm/sgidefs.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/asm.h>
#include <asm/page.h>
@@ -72,4 +72,4 @@ static inline void __iomem *get_gic(const struct vdso_data *data)
#endif /* CONFIG_CLKSRC_MIPS_GIC */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/mips/include/asm/vdso/vsyscall.h b/arch/mips/include/asm/vdso/vsyscall.h
index a4582870aaea4..ea9d04d05eafa 100644
--- a/arch/mips/include/asm/vdso/vsyscall.h
+++ b/arch/mips/include/asm/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
@@ -21,6 +21,6 @@ struct vdso_data *__mips_get_k_vdso_data(void)
/* 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 */
diff --git a/arch/mips/include/asm/xtalk/xtalk.h b/arch/mips/include/asm/xtalk/xtalk.h
index 680e7efebbaf6..dfe6a3fce65a5 100644
--- a/arch/mips/include/asm/xtalk/xtalk.h
+++ b/arch/mips/include/asm/xtalk/xtalk.h
@@ -12,7 +12,7 @@
#ifndef _ASM_XTALK_XTALK_H
#define _ASM_XTALK_XTALK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* User-level device driver visible types
*/
@@ -47,6 +47,6 @@ typedef struct xtalk_piomap_s *xtalk_piomap_t;
#define XIO_PORT(x) ((xwidgetnum_t)(((x)&XIO_PORT_BITS) >> XIO_PORT_SHIFT))
#define XIO_PACK(p, o) ((((uint64_t)(p))<<XIO_PORT_SHIFT) | ((o)&XIO_ADDR_BITS))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_XTALK_XTALK_H */
diff --git a/arch/mips/include/asm/xtalk/xwidget.h b/arch/mips/include/asm/xtalk/xwidget.h
index 24f121da6a1d9..efcfe4494576a 100644
--- a/arch/mips/include/asm/xtalk/xwidget.h
+++ b/arch/mips/include/asm/xtalk/xwidget.h
@@ -203,7 +203,7 @@ static const struct widget_ident __initconst widget_idents[] = {
* widget target flush register are widget dependent thus will not be
* defined here
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef u32 widgetreg_t;
/* widget configuration registers */
@@ -274,6 +274,6 @@ typedef struct xwidget_hwid_s {
((hwid2)->mfg_num == XWIDGET_MFG_NUM_NONE) || \
((hwid1)->mfg_num == (hwid2)->mfg_num)))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_XTALK_XWIDGET_H */
diff --git a/drivers/soc/bcm/brcmstb/pm/pm.h b/drivers/soc/bcm/brcmstb/pm/pm.h
index 94a380470a2f9..17f7a06a7a836 100644
--- a/drivers/soc/bcm/brcmstb/pm/pm.h
+++ b/drivers/soc/bcm/brcmstb/pm/pm.h
@@ -60,7 +60,7 @@
PM_DEEP_STANDBY | \
PM_PLL_PWRDOWN | PM_PWR_DOWN)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef CONFIG_MIPS
extern const unsigned long brcmstb_pm_do_s2_sz;
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 19/41] mips: Replace __ASSEMBLY__ with __ASSEMBLER__ in the mips headers
2025-03-14 7:09 ` [PATCH 19/41] mips: Replace __ASSEMBLY__ with __ASSEMBLER__ in the mips headers Thomas Huth
@ 2025-03-20 12:56 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 94+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-20 12:56 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Bogendoerfer, linux-mips
On 14/3/25 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 almost a completely mechanical patch (done with a simple
> "sed -i" statement), with just one comment tweaked manually in
> arch/mips/include/asm/cpu.h (that was missing some underscores).
>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: linux-mips@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/mips/include/asm/addrspace.h | 4 +--
> arch/mips/include/asm/asm-eva.h | 6 ++--
> arch/mips/include/asm/asm.h | 8 ++---
> arch/mips/include/asm/bmips.h | 4 +--
> arch/mips/include/asm/cpu.h | 4 +--
> arch/mips/include/asm/dec/ecc.h | 2 +-
> arch/mips/include/asm/dec/interrupts.h | 4 +--
> arch/mips/include/asm/dec/kn01.h | 2 +-
> arch/mips/include/asm/dec/kn02.h | 2 +-
> arch/mips/include/asm/dec/kn02xa.h | 2 +-
> arch/mips/include/asm/eva.h | 4 +--
> arch/mips/include/asm/ftrace.h | 4 +--
> arch/mips/include/asm/hazards.h | 4 +--
> arch/mips/include/asm/irqflags.h | 4 +--
> arch/mips/include/asm/jazz.h | 16 ++++-----
> arch/mips/include/asm/jump_label.h | 4 +--
> arch/mips/include/asm/linkage.h | 2 +-
> arch/mips/include/asm/mach-generic/spaces.h | 4 +--
> arch/mips/include/asm/mips-boards/bonito64.h | 4 +--
> arch/mips/include/asm/mipsmtregs.h | 6 ++--
> arch/mips/include/asm/mipsregs.h | 6 ++--
> arch/mips/include/asm/msa.h | 4 +--
> arch/mips/include/asm/pci/bridge.h | 4 +--
> arch/mips/include/asm/pm.h | 6 ++--
> arch/mips/include/asm/prefetch.h | 2 +-
> arch/mips/include/asm/regdef.h | 4 +--
> arch/mips/include/asm/sibyte/board.h | 4 +--
> arch/mips/include/asm/sibyte/sb1250.h | 2 +-
> arch/mips/include/asm/sibyte/sb1250_defs.h | 6 ++--
> arch/mips/include/asm/smp-cps.h | 6 ++--
> arch/mips/include/asm/sn/addrs.h | 18 +++++-----
> arch/mips/include/asm/sn/gda.h | 4 +--
> arch/mips/include/asm/sn/kldir.h | 4 +--
> arch/mips/include/asm/sn/klkernvars.h | 4 +--
> arch/mips/include/asm/sn/launch.h | 4 +--
> arch/mips/include/asm/sn/nmi.h | 8 ++---
> arch/mips/include/asm/sn/sn0/addrs.h | 14 ++++----
> arch/mips/include/asm/sn/sn0/hub.h | 2 +-
> arch/mips/include/asm/sn/sn0/hubio.h | 36 ++++++++++----------
> arch/mips/include/asm/sn/sn0/hubmd.h | 4 +--
> arch/mips/include/asm/sn/sn0/hubni.h | 6 ++--
> arch/mips/include/asm/sn/sn0/hubpi.h | 4 +--
> arch/mips/include/asm/sn/types.h | 2 +-
> arch/mips/include/asm/sync.h | 2 +-
> arch/mips/include/asm/thread_info.h | 4 +--
> arch/mips/include/asm/unistd.h | 4 +--
> arch/mips/include/asm/vdso/gettimeofday.h | 4 +--
> arch/mips/include/asm/vdso/processor.h | 4 +--
> arch/mips/include/asm/vdso/vdso.h | 4 +--
> arch/mips/include/asm/vdso/vsyscall.h | 4 +--
> arch/mips/include/asm/xtalk/xtalk.h | 4 +--
> arch/mips/include/asm/xtalk/xwidget.h | 4 +--
> drivers/soc/bcm/brcmstb/pm/pm.h | 2 +-
> 53 files changed, 140 insertions(+), 140 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 20/41] nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (18 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 19/41] mips: Replace __ASSEMBLY__ with __ASSEMBLER__ in the mips headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 21/41] nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (20 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Dinh Nguyen
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/nios2/include/uapi/asm/ptrace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/nios2/include/uapi/asm/ptrace.h b/arch/nios2/include/uapi/asm/ptrace.h
index 2b91dbe5bcfee..1298db9f0fc98 100644
--- a/arch/nios2/include/uapi/asm/ptrace.h
+++ b/arch/nios2/include/uapi/asm/ptrace.h
@@ -13,7 +13,7 @@
#ifndef _UAPI_ASM_NIOS2_PTRACE_H
#define _UAPI_ASM_NIOS2_PTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -80,5 +80,5 @@ struct user_pt_regs {
__u32 regs[49];
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_NIOS2_PTRACE_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 21/41] nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (19 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 20/41] nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 22/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (19 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth, Dinh Nguyen
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: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/nios2/include/asm/entry.h | 4 ++--
arch/nios2/include/asm/page.h | 4 ++--
arch/nios2/include/asm/processor.h | 4 ++--
arch/nios2/include/asm/ptrace.h | 4 ++--
arch/nios2/include/asm/registers.h | 4 ++--
arch/nios2/include/asm/setup.h | 4 ++--
arch/nios2/include/asm/thread_info.h | 4 ++--
arch/nios2/include/asm/traps.h | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/nios2/include/asm/entry.h b/arch/nios2/include/asm/entry.h
index bafb7b2ca59fc..cb25ed56450ab 100644
--- a/arch/nios2/include/asm/entry.h
+++ b/arch/nios2/include/asm/entry.h
@@ -10,7 +10,7 @@
#ifndef _ASM_NIOS2_ENTRY_H
#define _ASM_NIOS2_ENTRY_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/processor.h>
#include <asm/registers.h>
@@ -117,5 +117,5 @@
addi sp, sp, SWITCH_STACK_SIZE
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_NIOS2_ENTRY_H */
diff --git a/arch/nios2/include/asm/page.h b/arch/nios2/include/asm/page.h
index 2897ec1b74f61..00a51623d38a5 100644
--- a/arch/nios2/include/asm/page.h
+++ b/arch/nios2/include/asm/page.h
@@ -26,7 +26,7 @@
#define PAGE_OFFSET \
(CONFIG_NIOS2_MEM_BASE + CONFIG_NIOS2_KERNEL_REGION_BASE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This gives the physical RAM offset.
@@ -90,6 +90,6 @@ extern struct page *mem_map;
#include <asm-generic/getorder.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_NIOS2_PAGE_H */
diff --git a/arch/nios2/include/asm/processor.h b/arch/nios2/include/asm/processor.h
index eb44130364a9a..d9521c3c2df98 100644
--- a/arch/nios2/include/asm/processor.h
+++ b/arch/nios2/include/asm/processor.h
@@ -36,7 +36,7 @@
/* Kuser helpers is mapped to this user space address */
#define KUSER_BASE 0x1000
#define KUSER_SIZE (PAGE_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# define TASK_SIZE 0x7FFF0000UL
# define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
@@ -72,6 +72,6 @@ extern unsigned long __get_wchan(struct task_struct *p);
#define cpu_relax() barrier()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_NIOS2_PROCESSOR_H */
diff --git a/arch/nios2/include/asm/ptrace.h b/arch/nios2/include/asm/ptrace.h
index 9da34c3022a27..96cbcd40c7ce5 100644
--- a/arch/nios2/include/asm/ptrace.h
+++ b/arch/nios2/include/asm/ptrace.h
@@ -18,7 +18,7 @@
/* This struct defines the way the registers are stored on the
stack during a system call. */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pt_regs {
unsigned long r8; /* r8-r15 Caller-saved GP registers */
unsigned long r9;
@@ -78,5 +78,5 @@ extern void show_regs(struct pt_regs *);
int do_syscall_trace_enter(void);
void do_syscall_trace_exit(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_NIOS2_PTRACE_H */
diff --git a/arch/nios2/include/asm/registers.h b/arch/nios2/include/asm/registers.h
index 95b67dd16f818..165dab26221f2 100644
--- a/arch/nios2/include/asm/registers.h
+++ b/arch/nios2/include/asm/registers.h
@@ -6,7 +6,7 @@
#ifndef _ASM_NIOS2_REGISTERS_H
#define _ASM_NIOS2_REGISTERS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cpuinfo.h>
#endif
@@ -44,7 +44,7 @@
/* tlbmisc register bits */
#define TLBMISC_PID_SHIFT 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define TLBMISC_PID_MASK ((1UL << cpuinfo.tlb_pid_num_bits) - 1)
#endif
#define TLBMISC_WAY_MASK 0xf
diff --git a/arch/nios2/include/asm/setup.h b/arch/nios2/include/asm/setup.h
index 908a1526d1bd7..6d3f26a71cb51 100644
--- a/arch/nios2/include/asm/setup.h
+++ b/arch/nios2/include/asm/setup.h
@@ -8,7 +8,7 @@
#include <asm-generic/setup.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __KERNEL__
extern char exception_handler_hook[];
@@ -18,6 +18,6 @@ extern char fast_handler_end[];
extern void pagetable_init(void);
#endif/* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_NIOS2_SETUP_H */
diff --git a/arch/nios2/include/asm/thread_info.h b/arch/nios2/include/asm/thread_info.h
index 5abac9893b32b..83df79286d62e 100644
--- a/arch/nios2/include/asm/thread_info.h
+++ b/arch/nios2/include/asm/thread_info.h
@@ -24,7 +24,7 @@
#define THREAD_SIZE_ORDER 1
#define THREAD_SIZE 8192 /* 2 * PAGE_SIZE */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* low level task data that entry.S needs immediate access to
@@ -61,7 +61,7 @@ static inline struct thread_info *current_thread_info(void)
return (struct thread_info *)(sp & ~(THREAD_SIZE - 1));
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* thread information flags
diff --git a/arch/nios2/include/asm/traps.h b/arch/nios2/include/asm/traps.h
index afd77bef01c65..133a3dedbc3e8 100644
--- a/arch/nios2/include/asm/traps.h
+++ b/arch/nios2/include/asm/traps.h
@@ -12,7 +12,7 @@
#define TRAP_ID_SYSCALL 0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void _exception(int signo, struct pt_regs *regs, int code, unsigned long addr);
void do_page_fault(struct pt_regs *regs, unsigned long cause,
unsigned long address);
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 22/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (20 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 21/41] nios2: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-06-07 5:52 ` Stafford Horne
2025-03-14 7:09 ` [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (18 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Jonas Bonn,
Stefan Kristiansson, Stafford Horne, linux-openrisc
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: linux-openrisc@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/openrisc/include/uapi/asm/ptrace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/openrisc/include/uapi/asm/ptrace.h b/arch/openrisc/include/uapi/asm/ptrace.h
index a77cc9915ca8f..1f12a60d5a06c 100644
--- a/arch/openrisc/include/uapi/asm/ptrace.h
+++ b/arch/openrisc/include/uapi/asm/ptrace.h
@@ -20,7 +20,7 @@
#ifndef _UAPI__ASM_OPENRISC_PTRACE_H
#define _UAPI__ASM_OPENRISC_PTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This is the layout of the regset returned by the GETREGSET ptrace call
*/
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 22/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 ` [PATCH 22/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-06-07 5:52 ` Stafford Horne
0 siblings, 0 replies; 94+ messages in thread
From: Stafford Horne @ 2025-06-07 5:52 UTC (permalink / raw)
To: Thomas Huth
Cc: linux-kernel, Arnd Bergmann, linux-arch, Jonas Bonn,
Stefan Kristiansson, linux-openrisc
On Fri, Mar 14, 2025 at 08:09:53AM +0100, Thomas Huth wrote:
> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> this is not really useful for uapi headers (unless the userspace
> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> gets set automatically by the compiler when compiling assembly
> code.
>
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
Thanks Thomas,
This makes sense to me, I see the other discussions now and it look's
like there is still some discussions going on. For now I have added
this to the OpenRISC queue, but I don't think it will get in until 6.16.
That should give a bit more time for the discussion and more time to
test for me.
-Stafford
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> Cc: Stafford Horne <shorne@gmail.com>
> Cc: linux-openrisc@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/openrisc/include/uapi/asm/ptrace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/openrisc/include/uapi/asm/ptrace.h b/arch/openrisc/include/uapi/asm/ptrace.h
> index a77cc9915ca8f..1f12a60d5a06c 100644
> --- a/arch/openrisc/include/uapi/asm/ptrace.h
> +++ b/arch/openrisc/include/uapi/asm/ptrace.h
> @@ -20,7 +20,7 @@
> #ifndef _UAPI__ASM_OPENRISC_PTRACE_H
> #define _UAPI__ASM_OPENRISC_PTRACE_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /*
> * This is the layout of the regset returned by the GETREGSET ptrace call
> */
> --
> 2.48.1
>
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (21 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 22/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-06-06 6:42 ` Thomas Huth
2025-06-07 5:53 ` Stafford Horne
2025-03-14 7:09 ` [PATCH 24/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (17 subsequent siblings)
40 siblings, 2 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Jonas Bonn,
Stefan Kristiansson, Stafford Horne, linux-openrisc
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: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: linux-openrisc@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@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
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-06-06 6:42 ` Thomas Huth
2025-06-06 19:45 ` Stafford Horne
2025-06-07 5:53 ` Stafford Horne
1 sibling, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-06 6:42 UTC (permalink / raw)
To: Jonas Bonn, Stefan Kristiansson, Stafford Horne; +Cc: linux-openrisc
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: Jonas Bonn<jonas@southpole.se>
> Cc: Stefan Kristiansson<stefan.kristiansson@saunalahti.fi>
> Cc: Stafford Horne<shorne@gmail.com>
> Cc:linux-openrisc@vger.kernel.org
> Signed-off-by: Thomas Huth<thuth@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
>
Friendly ping!
Jonas, Stefan, Stafford, could you maybe pick this (and the previous patch)
up via your openrisc 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
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 6:42 ` Thomas Huth
@ 2025-06-06 19:45 ` Stafford Horne
2025-06-07 6:02 ` Stafford Horne
2025-06-10 5:13 ` Thomas Huth
0 siblings, 2 replies; 94+ messages in thread
From: Stafford Horne @ 2025-06-06 19:45 UTC (permalink / raw)
To: Thomas Huth; +Cc: Jonas Bonn, Stefan Kristiansson, linux-openrisc
On Fri, Jun 06, 2025 at 08:42:28AM +0200, Thomas Huth wrote:
> 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: Jonas Bonn<jonas@southpole.se>
> > Cc: Stefan Kristiansson<stefan.kristiansson@saunalahti.fi>
> > Cc: Stafford Horne<shorne@gmail.com>
> > Cc:linux-openrisc@vger.kernel.org
> > Signed-off-by: Thomas Huth<thuth@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
> >
>
> Friendly ping!
>
> Jonas, Stefan, Stafford, could you maybe pick this (and the previous patch)
> up via your openrisc tree? (x86 and parisc already got merge via their
> respective architecture trees, so I guess the same should happen for this
> patch here, too).
Hi Thomas,
Sure, this might not make it for the 6.16 merge window as we may not have time
for it to have a cycle in linux-next. Is that ok?
-Stafford
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 19:45 ` Stafford Horne
@ 2025-06-07 6:02 ` Stafford Horne
2025-06-10 5:17 ` Thomas Huth
2025-06-10 5:13 ` Thomas Huth
1 sibling, 1 reply; 94+ messages in thread
From: Stafford Horne @ 2025-06-07 6:02 UTC (permalink / raw)
To: Thomas Huth; +Cc: Jonas Bonn, Stefan Kristiansson, linux-openrisc
On Fri, Jun 06, 2025 at 08:45:02PM +0100, Stafford Horne wrote:
> On Fri, Jun 06, 2025 at 08:42:28AM +0200, Thomas Huth wrote:
> > 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: Jonas Bonn<jonas@southpole.se>
> > > Cc: Stefan Kristiansson<stefan.kristiansson@saunalahti.fi>
> > > Cc: Stafford Horne<shorne@gmail.com>
> > > Cc:linux-openrisc@vger.kernel.org
> > > Signed-off-by: Thomas Huth<thuth@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
> > >
> >
> > Friendly ping!
> >
> > Jonas, Stefan, Stafford, could you maybe pick this (and the previous patch)
> > up via your openrisc tree? (x86 and parisc already got merge via their
> > respective architecture trees, so I guess the same should happen for this
> > patch here, too).
>
> Hi Thomas,
>
> Sure, this might not make it for the 6.16 merge window as we may not have time
> for it to have a cycle in linux-next. Is that ok?
I have now put this in the OpenRISC queue. Note, I didn't pay much attention to
this series as it seemed generally OK to me and usually I figured these trivial
treewide patches should be merged via other means.
I expect it will take time to get all maintainers pick these up individually.
Do you have a plan for those? In the past I think Arnd has helped.
-Stafford
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-07 6:02 ` Stafford Horne
@ 2025-06-10 5:17 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-06-10 5:17 UTC (permalink / raw)
To: Stafford Horne; +Cc: Jonas Bonn, Stefan Kristiansson, linux-openrisc
On 07/06/2025 08.02, Stafford Horne wrote:
> On Fri, Jun 06, 2025 at 08:45:02PM +0100, Stafford Horne wrote:
>> On Fri, Jun 06, 2025 at 08:42:28AM +0200, Thomas Huth wrote:
>>> 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: Jonas Bonn<jonas@southpole.se>
>>>> Cc: Stefan Kristiansson<stefan.kristiansson@saunalahti.fi>
>>>> Cc: Stafford Horne<shorne@gmail.com>
>>>> Cc:linux-openrisc@vger.kernel.org
>>>> Signed-off-by: Thomas Huth<thuth@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
>>>>
>>>
>>> Friendly ping!
>>>
>>> Jonas, Stefan, Stafford, could you maybe pick this (and the previous patch)
>>> up via your openrisc tree? (x86 and parisc already got merge via their
>>> respective architecture trees, so I guess the same should happen for this
>>> patch here, too).
>>
>> Hi Thomas,
>>
>> Sure, this might not make it for the 6.16 merge window as we may not have time
>> for it to have a cycle in linux-next. Is that ok?
>
> I have now put this in the OpenRISC queue. Note, I didn't pay much attention to
> this series as it seemed generally OK to me and usually I figured these trivial
> treewide patches should be merged via other means.
>
> I expect it will take time to get all maintainers pick these up individually.
>
> Do you have a plan for those? In the past I think Arnd has helped.
I need to respin a couple of patches (s390x, powerpc, ...) since the headers
have already changed in the related spots, so I'm going to send those to the
respective maintainers when I'm done. Once those got merged, I guess I'm
going to respin the remaining patches and ask Arnd for help...
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 19:45 ` Stafford Horne
2025-06-07 6:02 ` Stafford Horne
@ 2025-06-10 5:13 ` Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-06-10 5:13 UTC (permalink / raw)
To: Stafford Horne; +Cc: Jonas Bonn, Stefan Kristiansson, linux-openrisc
On 06/06/2025 21.45, Stafford Horne wrote:
> On Fri, Jun 06, 2025 at 08:42:28AM +0200, Thomas Huth wrote:
>> 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: Jonas Bonn<jonas@southpole.se>
>>> Cc: Stefan Kristiansson<stefan.kristiansson@saunalahti.fi>
>>> Cc: Stafford Horne<shorne@gmail.com>
>>> Cc:linux-openrisc@vger.kernel.org
>>> Signed-off-by: Thomas Huth<thuth@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
>>>
>>
>> Friendly ping!
>>
>> Jonas, Stefan, Stafford, could you maybe pick this (and the previous patch)
>> up via your openrisc tree? (x86 and parisc already got merge via their
>> respective architecture trees, so I guess the same should happen for this
>> patch here, too).
>
> Hi Thomas,
>
> Sure, this might not make it for the 6.16 merge window as we may not have time
> for it to have a cycle in linux-next. Is that ok?
Hi Stafford,
yes, that's fine, there is no hurry for these patches.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
2025-06-06 6:42 ` Thomas Huth
@ 2025-06-07 5:53 ` Stafford Horne
1 sibling, 0 replies; 94+ messages in thread
From: Stafford Horne @ 2025-06-07 5:53 UTC (permalink / raw)
To: Thomas Huth
Cc: linux-kernel, Arnd Bergmann, linux-arch, Jonas Bonn,
Stefan Kristiansson, linux-openrisc
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 <jonas@southpole.se>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> Cc: Stafford Horne <shorne@gmail.com>
> Cc: linux-openrisc@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@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
>
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 24/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (22 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 23/41] openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-05-04 18:53 ` Helge Deller
2025-03-14 7:09 ` [PATCH 25/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (16 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, James E.J. Bottomley,
Helge Deller, linux-parisc
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is almost a completely mechanical patch (done with a simple
"sed -i" statement), except for a manual change in the file
arch/parisc/include/uapi/asm/signal.h (where a comment was missing
some underscores).
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/parisc/include/uapi/asm/pdc.h | 4 ++--
arch/parisc/include/uapi/asm/signal.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/parisc/include/uapi/asm/pdc.h b/arch/parisc/include/uapi/asm/pdc.h
index fef4f2e961601..65031ddf83720 100644
--- a/arch/parisc/include/uapi/asm/pdc.h
+++ b/arch/parisc/include/uapi/asm/pdc.h
@@ -361,7 +361,7 @@
/* size of the pdc_result buffer for firmware.c */
#define NUM_PDC_RESULT 32
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
/* flags for hardware_path */
#define PF_AUTOBOOT 0x80
@@ -741,6 +741,6 @@ struct pdc_firm_test_get_rtn_block { /* PDC_MODEL/PDC_FIRM_TEST_GET */
#define PIRANHA_CPU_ID 0x13
#define MAKO_CPU_ID 0x14
-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */
#endif /* _UAPI_PARISC_PDC_H */
diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h
index 40d7a574c5dd1..d99accf37341b 100644
--- a/arch/parisc/include/uapi/asm/signal.h
+++ b/arch/parisc/include/uapi/asm/signal.h
@@ -61,7 +61,7 @@
#define _NSIG_BPW (sizeof(unsigned long) * 8)
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
# include <linux/types.h>
@@ -80,5 +80,5 @@ typedef struct sigaltstack {
__kernel_size_t ss_size;
} stack_t;
-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
#endif /* _UAPI_ASM_PARISC_SIGNAL_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 24/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 ` [PATCH 24/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-05-04 18:53 ` Helge Deller
0 siblings, 0 replies; 94+ messages in thread
From: Helge Deller @ 2025-05-04 18:53 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, James E.J. Bottomley, linux-parisc
On 3/14/25 08:09, Thomas Huth wrote:
> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> this is not really useful for uapi headers (unless the userspace
> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> gets set automatically by the compiler when compiling assembly
> code.
>
> This is almost a completely mechanical patch (done with a simple
> "sed -i" statement), except for a manual change in the file
> arch/parisc/include/uapi/asm/signal.h (where a comment was missing
> some underscores).
>
> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
> Cc: Helge Deller <deller@gmx.de>
> Cc: linux-parisc@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/parisc/include/uapi/asm/pdc.h | 4 ++--
> arch/parisc/include/uapi/asm/signal.h | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
applied to the parisc git tree.
Thanks!
Helge
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 25/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (23 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 24/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-05-04 18:53 ` Helge Deller
2025-03-14 7:09 ` [PATCH 26/41] powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (15 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, James E.J. Bottomley,
Helge Deller, linux-parisc
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 mostly a completely mechanical patch (done with a simple
"sed -i" statement), except for some manual tweaks in the files
arch/parisc/include/asm/smp.h, arch/parisc/include/asm/signal.h,
arch/parisc/include/asm/thread_info.h and arch/parisc/include/asm/vdso.h
that had the macro spelled in a wrong way.
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/parisc/include/asm/alternative.h | 4 ++--
arch/parisc/include/asm/assembly.h | 4 ++--
arch/parisc/include/asm/barrier.h | 4 ++--
arch/parisc/include/asm/cache.h | 4 ++--
arch/parisc/include/asm/current.h | 4 ++--
arch/parisc/include/asm/dwarf.h | 4 ++--
arch/parisc/include/asm/fixmap.h | 4 ++--
arch/parisc/include/asm/ftrace.h | 4 ++--
arch/parisc/include/asm/jump_label.h | 4 ++--
arch/parisc/include/asm/kexec.h | 4 ++--
arch/parisc/include/asm/kgdb.h | 2 +-
arch/parisc/include/asm/linkage.h | 4 ++--
arch/parisc/include/asm/page.h | 6 +++---
arch/parisc/include/asm/pdc.h | 4 ++--
arch/parisc/include/asm/pdcpat.h | 4 ++--
arch/parisc/include/asm/pgtable.h | 8 ++++----
arch/parisc/include/asm/prefetch.h | 4 ++--
arch/parisc/include/asm/processor.h | 8 ++++----
arch/parisc/include/asm/psw.h | 4 ++--
arch/parisc/include/asm/signal.h | 4 ++--
arch/parisc/include/asm/smp.h | 4 ++--
arch/parisc/include/asm/spinlock_types.h | 4 ++--
arch/parisc/include/asm/thread_info.h | 4 ++--
arch/parisc/include/asm/traps.h | 2 +-
arch/parisc/include/asm/unistd.h | 4 ++--
arch/parisc/include/asm/vdso.h | 4 ++--
26 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/arch/parisc/include/asm/alternative.h b/arch/parisc/include/asm/alternative.h
index 1eb488f25b838..1601ae4b888d9 100644
--- a/arch/parisc/include/asm/alternative.h
+++ b/arch/parisc/include/asm/alternative.h
@@ -13,7 +13,7 @@
#define INSN_PxTLB 0x02 /* modify pdtlb, pitlb */
#define INSN_NOP 0x08000240 /* nop */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/types.h>
@@ -61,6 +61,6 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
.word (new_instr_ptr - .) ! \
.previous
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_PARISC_ALTERNATIVE_H */
diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
index 000a28e1c5e8d..c20261604f09c 100644
--- a/arch/parisc/include/asm/assembly.h
+++ b/arch/parisc/include/asm/assembly.h
@@ -53,7 +53,7 @@
#define SR_TEMP2 2
#define SR_USER 3
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_64BIT
#define LDREG ldd
@@ -582,5 +582,5 @@
.previous
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/parisc/include/asm/barrier.h b/arch/parisc/include/asm/barrier.h
index c705decf2bed5..519b1903c5ed3 100644
--- a/arch/parisc/include/asm/barrier.h
+++ b/arch/parisc/include/asm/barrier.h
@@ -4,7 +4,7 @@
#include <asm/alternative.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* The synchronize caches instruction executes as a nop on systems in
which all memory references are performed in order. */
@@ -93,5 +93,5 @@ do { \
})
#include <asm-generic/barrier.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_BARRIER_H */
diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
index a3f0f100f2194..3f8d3be6ef244 100644
--- a/arch/parisc/include/asm/cache.h
+++ b/arch/parisc/include/asm/cache.h
@@ -16,7 +16,7 @@
#define L1_CACHE_BYTES 16
#define L1_CACHE_SHIFT 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define SMP_CACHE_BYTES L1_CACHE_BYTES
@@ -66,7 +66,7 @@ void parisc_setup_cache_timing(void);
ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory")
#define asm_syncdma() asm volatile("syncdma" :::"memory")
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
/* Classes of processor wrt: disabling space register hashing */
diff --git a/arch/parisc/include/asm/current.h b/arch/parisc/include/asm/current.h
index dc7aea07c3f38..2814529a4c286 100644
--- a/arch/parisc/include/asm/current.h
+++ b/arch/parisc/include/asm/current.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PARISC_CURRENT_H
#define _ASM_PARISC_CURRENT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
static __always_inline struct task_struct *get_current(void)
@@ -16,6 +16,6 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PARISC_CURRENT_H */
diff --git a/arch/parisc/include/asm/dwarf.h b/arch/parisc/include/asm/dwarf.h
index f4512db86a190..526f4a79262cd 100644
--- a/arch/parisc/include/asm/dwarf.h
+++ b/arch/parisc/include/asm/dwarf.h
@@ -6,7 +6,7 @@
#ifndef _ASM_PARISC_DWARF_H
#define _ASM_PARISC_DWARF_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define CFI_STARTPROC .cfi_startproc
#define CFI_ENDPROC .cfi_endproc
@@ -15,6 +15,6 @@
#define CFI_REL_OFFSET .cfi_rel_offset
#define CFI_UNDEFINED .cfi_undefined
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PARISC_DWARF_H */
diff --git a/arch/parisc/include/asm/fixmap.h b/arch/parisc/include/asm/fixmap.h
index 5cd80ce1163a8..9cafa449c4a7d 100644
--- a/arch/parisc/include/asm/fixmap.h
+++ b/arch/parisc/include/asm/fixmap.h
@@ -39,7 +39,7 @@
#define KERNEL_MAP_START (GATEWAY_PAGE_SIZE)
#define KERNEL_MAP_END (FIXMAP_START)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum fixed_addresses {
@@ -59,6 +59,6 @@ extern void *parisc_vmalloc_start;
void set_fixmap(enum fixed_addresses idx, phys_addr_t phys);
void clear_fixmap(enum fixed_addresses idx);
-#endif /*__ASSEMBLY__*/
+#endif /*__ASSEMBLER__*/
#endif /*_ASM_FIXMAP_H*/
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
index f1cc1ee3a6473..8b89d2b642eb2 100644
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PARISC_FTRACE_H
#define _ASM_PARISC_FTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void mcount(void);
#define MCOUNT_ADDR ((unsigned long)mcount)
@@ -29,6 +29,6 @@ unsigned long ftrace_call_adjust(unsigned long addr);
#define ftrace_return_address(n) return_address(n)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PARISC_FTRACE_H */
diff --git a/arch/parisc/include/asm/jump_label.h b/arch/parisc/include/asm/jump_label.h
index 317ebc5edc9fe..f325ae3c622f3 100644
--- a/arch/parisc/include/asm/jump_label.h
+++ b/arch/parisc/include/asm/jump_label.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PARISC_JUMP_LABEL_H
#define _ASM_PARISC_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/stringify.h>
@@ -44,5 +44,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/parisc/include/asm/kexec.h b/arch/parisc/include/asm/kexec.h
index 87e1740069955..bf31e2d50df9e 100644
--- a/arch/parisc/include/asm/kexec.h
+++ b/arch/parisc/include/asm/kexec.h
@@ -14,7 +14,7 @@
#define KEXEC_ARCH KEXEC_ARCH_PARISC
#define ARCH_HAS_KIMAGE_ARCH
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct kimage_arch {
unsigned long initrd_start;
@@ -28,6 +28,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
/* Dummy implementation for now */
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PARISC_KEXEC_H */
diff --git a/arch/parisc/include/asm/kgdb.h b/arch/parisc/include/asm/kgdb.h
index 317cd434bee3d..9ece98bc6d9d6 100644
--- a/arch/parisc/include/asm/kgdb.h
+++ b/arch/parisc/include/asm/kgdb.h
@@ -21,7 +21,7 @@
#define CACHE_FLUSH_IS_SAFE 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void arch_kgdb_breakpoint(void)
{
diff --git a/arch/parisc/include/asm/linkage.h b/arch/parisc/include/asm/linkage.h
index cd6fe4febeadb..d4cad492b971c 100644
--- a/arch/parisc/include/asm/linkage.h
+++ b/arch/parisc/include/asm/linkage.h
@@ -15,7 +15,7 @@
*/
#define ASM_NL !
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ENTRY(name) \
ALIGN !\
@@ -35,6 +35,6 @@ name: ASM_NL\
.procend ASM_NL\
ENDPROC(name)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_PARISC_LINKAGE_H */
diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h
index 7fd4470926307..8f4e51071ea1d 100644
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
@@ -8,7 +8,7 @@
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <asm/cache.h>
@@ -93,7 +93,7 @@ typedef struct __physmem_range {
extern physmem_range_t pmem_ranges[];
extern int npmem_ranges;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* WARNING: The definitions below must match exactly to sizeof(pte_t)
* etc
@@ -139,7 +139,7 @@ extern int npmem_ranges;
#define KERNEL_BINARY_TEXT_START (__PAGE_OFFSET + 0x100000)
/* These macros don't work for 64-bit C code -- don't allow in C at all */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define PA(x) ((x)-__PAGE_OFFSET)
# define VA(x) ((x)+__PAGE_OFFSET)
#endif
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h
index 5d2d9737e579d..6080a1516b349 100644
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
@@ -4,7 +4,7 @@
#include <uapi/asm/pdc.h>
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
extern int parisc_narrow_firmware;
@@ -109,5 +109,5 @@ static inline char * os_id_to_string(u16 os_id) {
}
}
-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */
#endif /* _PARISC_PDC_H */
diff --git a/arch/parisc/include/asm/pdcpat.h b/arch/parisc/include/asm/pdcpat.h
index 8f160375b865b..84ac81b1addec 100644
--- a/arch/parisc/include/asm/pdcpat.h
+++ b/arch/parisc/include/asm/pdcpat.h
@@ -210,7 +210,7 @@
#define PDC_PAT_SYSTEM_INFO 76L
/* PDC_PAT_SYSTEM_INFO uses the same options as PDC_SYSTEM_INFO function. */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#ifdef CONFIG_64BIT
@@ -389,6 +389,6 @@ extern int pdc_pat_mem_get_dimm_phys_location(
struct pdc_pat_mem_phys_mem_location *pret,
unsigned long phys_addr);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* ! __PARISC_PATPDC_H */
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index babf65751e818..4ac43e8014652 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -12,7 +12,7 @@
#include <asm/fixmap.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* we simulate an x86-style page table for the linux mm code
*/
@@ -73,7 +73,7 @@ extern void __update_cache(pte_t pte);
mb(); \
} while(0)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@@ -226,7 +226,7 @@ extern void __update_cache(pte_t pte);
#define PxD_FLAG_SHIFT (4)
#define PxD_VALUE_SHIFT (PFN_PTE_SHIFT-PxD_FLAG_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_USER)
#define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE)
@@ -477,7 +477,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
#define pte_same(A,B) (pte_val(A) == pte_val(B))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* TLB page size encoding - see table 3-1 in parisc20.pdf */
diff --git a/arch/parisc/include/asm/prefetch.h b/arch/parisc/include/asm/prefetch.h
index 6e63f720024da..748eefb27c68a 100644
--- a/arch/parisc/include/asm/prefetch.h
+++ b/arch/parisc/include/asm/prefetch.h
@@ -16,7 +16,7 @@
#ifndef __ASM_PARISC_PREFETCH_H
#define __ASM_PARISC_PREFETCH_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PREFETCH
#define ARCH_HAS_PREFETCH
@@ -40,6 +40,6 @@ static inline void prefetchw(const void *addr)
#endif /* CONFIG_PA20 */
#endif /* CONFIG_PREFETCH */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_PARISC_PROCESSOR_H */
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h
index 77fac02188e19..4c14bde39aac0 100644
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -9,7 +9,7 @@
#ifndef __ASM_PARISC_PROCESSOR_H
#define __ASM_PARISC_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/threads.h>
#include <linux/irqreturn.h>
@@ -20,7 +20,7 @@
#include <asm/ptrace.h>
#include <asm/types.h>
#include <asm/percpu.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define HAVE_ARCH_PICK_MMAP_LAYOUT
@@ -45,7 +45,7 @@
#define STACK_TOP TASK_SIZE
#define STACK_TOP_MAX DEFAULT_TASK_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct rlimit;
unsigned long mmap_upper_limit(struct rlimit *rlim_stack);
@@ -325,6 +325,6 @@ extern void sba_directed_lmmio(struct parisc_device *, struct resource *);
extern void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask);
extern void ccio_cujo20_fixup(struct parisc_device *dev, u32 iovp);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_PARISC_PROCESSOR_H */
diff --git a/arch/parisc/include/asm/psw.h b/arch/parisc/include/asm/psw.h
index 46921ffcc4077..9140e1ab7e636 100644
--- a/arch/parisc/include/asm/psw.h
+++ b/arch/parisc/include/asm/psw.h
@@ -60,7 +60,7 @@
#define USER_PSW_MASK (WIDE_PSW | PSW_T | PSW_N | PSW_X | PSW_B | PSW_V | PSW_CB)
#define USER_PSW (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* The program status word as bitfields. */
struct pa_psw {
@@ -99,6 +99,6 @@ struct pa_psw {
#define pa_psw(task) ((struct pa_psw *) ((char *) (task) + TASK_PT_PSW))
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h
index e84883c6b4c7a..85c3d7409bbcd 100644
--- a/arch/parisc/include/asm/signal.h
+++ b/arch/parisc/include/asm/signal.h
@@ -4,12 +4,12 @@
#include <uapi/asm/signal.h>
-# ifndef __ASSEMBLY__
+# ifndef __ASSEMBLER__
/* Most things should be clean enough to redefine this at will, if care
is taken to make libc match. */
#include <asm/sigcontext.h>
-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_PARISC_SIGNAL_H */
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h
index 94d1f21ce99a1..0cf1c3a2696a9 100644
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
@@ -12,7 +12,7 @@ extern int init_per_cpu(int cpuid);
#define PDC_OS_BOOT_RENDEZVOUS 0x10
#define PDC_OS_BOOT_RENDEZVOUS_HI 0x28
-#ifndef ASSEMBLY
+#ifndef __ASSEMBLER__
#include <linux/bitops.h>
#include <linux/threads.h> /* for NR_CPUS */
#include <linux/cpumask.h>
@@ -34,7 +34,7 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
#define raw_smp_processor_id() (current_thread_info()->cpu)
-#endif /* !ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
#else /* CONFIG_SMP */
diff --git a/arch/parisc/include/asm/spinlock_types.h b/arch/parisc/include/asm/spinlock_types.h
index 7b986b09dba84..8e6889bc23ccf 100644
--- a/arch/parisc/include/asm/spinlock_types.h
+++ b/arch/parisc/include/asm/spinlock_types.h
@@ -6,7 +6,7 @@
#define SPINLOCK_BREAK_INSN 0x0000c006 /* break 6,6 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
volatile unsigned int lock[4];
@@ -26,7 +26,7 @@ typedef struct {
volatile unsigned int counter;
} arch_rwlock_t;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define __ARCH_RW_LOCK_UNLOCKED__ 0x01000000
#define __ARCH_RW_LOCK_UNLOCKED { .lock_mutex = __ARCH_SPIN_LOCK_UNLOCKED, \
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h
index 1a58795f785c5..b283738bb6dab 100644
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PARISC_THREAD_INFO_H
#define _ASM_PARISC_THREAD_INFO_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <asm/special_insns.h>
@@ -20,7 +20,7 @@ struct thread_info {
.preempt_count = INIT_PREEMPT_COUNT, \
}
-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
/* thread information allocation */
diff --git a/arch/parisc/include/asm/traps.h b/arch/parisc/include/asm/traps.h
index 0ccdb738a9a36..10c8fb68e4040 100644
--- a/arch/parisc/include/asm/traps.h
+++ b/arch/parisc/include/asm/traps.h
@@ -4,7 +4,7 @@
#define PARISC_ITLB_TRAP 6 /* defined by architecture. Do not change. */
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
struct pt_regs;
/* traps.c */
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index a97c0fd55f91b..3e46c6ea9df6e 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -6,7 +6,7 @@
#define __NR_Linux_syscalls __NR_syscalls
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define SYS_ify(syscall_name) __NR_##syscall_name
@@ -144,7 +144,7 @@
#define __ARCH_WANT_SYS_UTIME
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#undef STR
diff --git a/arch/parisc/include/asm/vdso.h b/arch/parisc/include/asm/vdso.h
index 2a2dc11b5545f..83697711bd64d 100644
--- a/arch/parisc/include/asm/vdso.h
+++ b/arch/parisc/include/asm/vdso.h
@@ -2,7 +2,7 @@
#ifndef __PARISC_VDSO_H__
#define __PARISC_VDSO_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_64BIT
#include <generated/vdso64-offsets.h>
@@ -14,7 +14,7 @@
extern struct vdso_data *vdso_data;
-#endif /* __ASSEMBLY __ */
+#endif /* __ASSEMBLER__ */
/* Default link addresses for the vDSOs */
#define VDSO_LBASE 0
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 25/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 ` [PATCH 25/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-05-04 18:53 ` Helge Deller
0 siblings, 0 replies; 94+ messages in thread
From: Helge Deller @ 2025-05-04 18:53 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, James E.J. Bottomley, linux-parisc
On 3/14/25 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 mostly a completely mechanical patch (done with a simple
> "sed -i" statement), except for some manual tweaks in the files
> arch/parisc/include/asm/smp.h, arch/parisc/include/asm/signal.h,
> arch/parisc/include/asm/thread_info.h and arch/parisc/include/asm/vdso.h
> that had the macro spelled in a wrong way.
>
> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
> Cc: Helge Deller <deller@gmx.de>
> Cc: linux-parisc@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/parisc/include/asm/alternative.h | 4 ++--
> arch/parisc/include/asm/assembly.h | 4 ++--
> arch/parisc/include/asm/barrier.h | 4 ++--
> arch/parisc/include/asm/cache.h | 4 ++--
> arch/parisc/include/asm/current.h | 4 ++--
> arch/parisc/include/asm/dwarf.h | 4 ++--
> arch/parisc/include/asm/fixmap.h | 4 ++--
> arch/parisc/include/asm/ftrace.h | 4 ++--
> arch/parisc/include/asm/jump_label.h | 4 ++--
> arch/parisc/include/asm/kexec.h | 4 ++--
> arch/parisc/include/asm/kgdb.h | 2 +-
> arch/parisc/include/asm/linkage.h | 4 ++--
> arch/parisc/include/asm/page.h | 6 +++---
> arch/parisc/include/asm/pdc.h | 4 ++--
> arch/parisc/include/asm/pdcpat.h | 4 ++--
> arch/parisc/include/asm/pgtable.h | 8 ++++----
> arch/parisc/include/asm/prefetch.h | 4 ++--
> arch/parisc/include/asm/processor.h | 8 ++++----
> arch/parisc/include/asm/psw.h | 4 ++--
> arch/parisc/include/asm/signal.h | 4 ++--
> arch/parisc/include/asm/smp.h | 4 ++--
> arch/parisc/include/asm/spinlock_types.h | 4 ++--
> arch/parisc/include/asm/thread_info.h | 4 ++--
> arch/parisc/include/asm/traps.h | 2 +-
> arch/parisc/include/asm/unistd.h | 4 ++--
> arch/parisc/include/asm/vdso.h | 4 ++--
> 26 files changed, 55 insertions(+), 55 deletions(-)
applied to the parisc git tree.
Thanks!
Helge
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 26/41] powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (24 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 25/41] parisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 27/41] powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (14 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Christophe Leroy, Naveen N Rao,
linuxppc-dev
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/powerpc/include/uapi/asm/opal-prd.h | 4 ++--
arch/powerpc/include/uapi/asm/ptrace.h | 12 ++++++------
arch/powerpc/include/uapi/asm/types.h | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/include/uapi/asm/opal-prd.h b/arch/powerpc/include/uapi/asm/opal-prd.h
index 1869cf83a870e..11abcf0192ca1 100644
--- a/arch/powerpc/include/uapi/asm/opal-prd.h
+++ b/arch/powerpc/include/uapi/asm/opal-prd.h
@@ -40,7 +40,7 @@
#define OPAL_PRD_SCOM_READ _IOR('o', 0x02, struct opal_prd_scom)
#define OPAL_PRD_SCOM_WRITE _IOW('o', 0x03, struct opal_prd_scom)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct opal_prd_info {
__u64 version;
@@ -54,6 +54,6 @@ struct opal_prd_scom {
__s64 rc;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_POWERPC_OPAL_PRD_H */
diff --git a/arch/powerpc/include/uapi/asm/ptrace.h b/arch/powerpc/include/uapi/asm/ptrace.h
index 7004cfea3f5ff..01e630149d48e 100644
--- a/arch/powerpc/include/uapi/asm/ptrace.h
+++ b/arch/powerpc/include/uapi/asm/ptrace.h
@@ -27,7 +27,7 @@
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __KERNEL__
struct user_pt_regs
@@ -57,7 +57,7 @@ struct pt_regs
unsigned long result; /* Result of a system call */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
@@ -200,7 +200,7 @@ struct pt_regs
#define PPC_PTRACE_SETHWDEBUG 0x88
#define PPC_PTRACE_DELHWDEBUG 0x87
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct ppc_debug_info {
__u32 version; /* Only version 1 exists to date */
@@ -212,7 +212,7 @@ struct ppc_debug_info {
__u64 features;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* features will have bits indication whether there is support for:
@@ -224,7 +224,7 @@ struct ppc_debug_info {
#define PPC_DEBUG_FEATURE_DATA_BP_DAWR 0x0000000000000010
#define PPC_DEBUG_FEATURE_DATA_BP_ARCH_31 0x0000000000000020
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct ppc_hw_breakpoint {
__u32 version; /* currently, version must be 1 */
@@ -236,7 +236,7 @@ struct ppc_hw_breakpoint {
__u64 condition_value; /* contents of the DVC register */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Trigger Type
diff --git a/arch/powerpc/include/uapi/asm/types.h b/arch/powerpc/include/uapi/asm/types.h
index 327616fb70e44..9dbf55e38ea58 100644
--- a/arch/powerpc/include/uapi/asm/types.h
+++ b/arch/powerpc/include/uapi/asm/types.h
@@ -28,14 +28,14 @@
# include <asm-generic/int-ll64.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
__u32 u[4];
} __attribute__((aligned(16))) __vector128;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_POWERPC_TYPES_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 27/41] powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (25 preceding siblings ...)
2025-03-14 7:09 ` [PATCH 26/41] powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` Thomas Huth
` (13 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Madhavan Srinivasan,
Michael Ellerman, Nicholas Piggin, Christophe Leroy, Naveen N Rao,
linuxppc-dev
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 almost a completely mechanical patch (done with a simple
"sed -i" statement), apart from tweaking two comments manually in
arch/powerpc/include/asm/bug.h and arch/powerpc/include/asm/kasan.h
(which did not have proper underscores at the end) and fixing a
checkpatch error about spaces in arch/powerpc/include/asm/spu_csa.h.
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/powerpc/boot/page.h | 2 +-
arch/powerpc/include/asm/asm-const.h | 2 +-
arch/powerpc/include/asm/barrier.h | 2 +-
arch/powerpc/include/asm/book3s/32/kup.h | 4 ++--
arch/powerpc/include/asm/book3s/32/mmu-hash.h | 8 ++++----
arch/powerpc/include/asm/book3s/32/pgtable.h | 12 ++++++------
arch/powerpc/include/asm/book3s/64/hash-4k.h | 4 ++--
arch/powerpc/include/asm/book3s/64/hash-64k.h | 4 ++--
arch/powerpc/include/asm/book3s/64/hash.h | 4 ++--
arch/powerpc/include/asm/book3s/64/kup.h | 6 +++---
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 12 ++++++------
arch/powerpc/include/asm/book3s/64/mmu.h | 8 ++++----
arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 4 ++--
arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++-----
arch/powerpc/include/asm/book3s/64/radix.h | 8 ++++----
arch/powerpc/include/asm/book3s/64/slice.h | 4 ++--
arch/powerpc/include/asm/bug.h | 14 +++++++-------
arch/powerpc/include/asm/cache.h | 4 ++--
arch/powerpc/include/asm/cpu_has_feature.h | 4 ++--
arch/powerpc/include/asm/cpuidle.h | 2 +-
arch/powerpc/include/asm/cputable.h | 8 ++++----
arch/powerpc/include/asm/cputhreads.h | 4 ++--
arch/powerpc/include/asm/dcr-generic.h | 4 ++--
arch/powerpc/include/asm/dcr-native.h | 4 ++--
arch/powerpc/include/asm/dcr.h | 4 ++--
arch/powerpc/include/asm/epapr_hcalls.h | 4 ++--
arch/powerpc/include/asm/exception-64e.h | 2 +-
arch/powerpc/include/asm/exception-64s.h | 6 +++---
arch/powerpc/include/asm/extable.h | 2 +-
arch/powerpc/include/asm/feature-fixups.h | 6 +++---
arch/powerpc/include/asm/firmware.h | 4 ++--
arch/powerpc/include/asm/fixmap.h | 4 ++--
arch/powerpc/include/asm/ftrace.h | 8 ++++----
arch/powerpc/include/asm/head-64.h | 4 ++--
arch/powerpc/include/asm/hvcall.h | 4 ++--
arch/powerpc/include/asm/hw_irq.h | 4 ++--
arch/powerpc/include/asm/interrupt.h | 4 ++--
arch/powerpc/include/asm/irqflags.h | 2 +-
arch/powerpc/include/asm/jump_label.h | 2 +-
arch/powerpc/include/asm/kasan.h | 4 ++--
arch/powerpc/include/asm/kdump.h | 4 ++--
arch/powerpc/include/asm/kexec.h | 4 ++--
arch/powerpc/include/asm/kgdb.h | 4 ++--
arch/powerpc/include/asm/kup.h | 8 ++++----
arch/powerpc/include/asm/kvm_asm.h | 2 +-
arch/powerpc/include/asm/kvm_book3s_asm.h | 6 +++---
arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 ++--
arch/powerpc/include/asm/lv1call.h | 4 ++--
arch/powerpc/include/asm/mmu.h | 8 ++++----
arch/powerpc/include/asm/mpc52xx.h | 12 ++++++------
arch/powerpc/include/asm/nohash/32/kup-8xx.h | 4 ++--
arch/powerpc/include/asm/nohash/32/mmu-44x.h | 4 ++--
arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 4 ++--
arch/powerpc/include/asm/nohash/32/pgtable.h | 12 ++++++------
arch/powerpc/include/asm/nohash/32/pte-8xx.h | 2 +-
arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 8 ++++----
arch/powerpc/include/asm/nohash/64/pgtable.h | 4 ++--
arch/powerpc/include/asm/nohash/kup-booke.h | 4 ++--
arch/powerpc/include/asm/nohash/mmu-e500.h | 4 ++--
arch/powerpc/include/asm/nohash/pgtable.h | 6 +++---
arch/powerpc/include/asm/nohash/pte-e500.h | 4 ++--
arch/powerpc/include/asm/opal-api.h | 4 ++--
arch/powerpc/include/asm/opal.h | 4 ++--
arch/powerpc/include/asm/page.h | 14 +++++++-------
arch/powerpc/include/asm/page_32.h | 4 ++--
arch/powerpc/include/asm/page_64.h | 4 ++--
arch/powerpc/include/asm/pgtable.h | 8 ++++----
arch/powerpc/include/asm/ppc_asm.h | 4 ++--
arch/powerpc/include/asm/processor.h | 8 ++++----
arch/powerpc/include/asm/ptrace.h | 6 +++---
arch/powerpc/include/asm/reg.h | 6 +++---
arch/powerpc/include/asm/reg_booke.h | 4 ++--
arch/powerpc/include/asm/reg_fsl_emb.h | 4 ++--
arch/powerpc/include/asm/setup.h | 4 ++--
arch/powerpc/include/asm/smp.h | 4 ++--
arch/powerpc/include/asm/spu_csa.h | 4 ++--
arch/powerpc/include/asm/synch.h | 4 ++--
arch/powerpc/include/asm/thread_info.h | 8 ++++----
arch/powerpc/include/asm/tm.h | 4 ++--
arch/powerpc/include/asm/types.h | 4 ++--
arch/powerpc/include/asm/unistd.h | 4 ++--
arch/powerpc/include/asm/vdso.h | 6 +++---
arch/powerpc/include/asm/vdso/getrandom.h | 4 ++--
arch/powerpc/include/asm/vdso/gettimeofday.h | 4 ++--
arch/powerpc/include/asm/vdso/processor.h | 4 ++--
arch/powerpc/include/asm/vdso/vsyscall.h | 4 ++--
arch/powerpc/include/asm/vdso_datapage.h | 6 +++---
arch/powerpc/kernel/head_booke.h | 4 ++--
arch/powerpc/net/bpf_jit.h | 2 +-
arch/powerpc/platforms/powernv/subcore.h | 4 ++--
arch/powerpc/xmon/xmon_bpts.h | 4 ++--
.../selftests/powerpc/include/instructions.h | 2 +-
92 files changed, 232 insertions(+), 232 deletions(-)
diff --git a/arch/powerpc/boot/page.h b/arch/powerpc/boot/page.h
index c3d55fc8f34c4..e44a3119720db 100644
--- a/arch/powerpc/boot/page.h
+++ b/arch/powerpc/boot/page.h
@@ -5,7 +5,7 @@
* Copyright (C) 2001 PPC64 Team, IBM Corp
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ASM_CONST(x) x
#else
#define __ASM_CONST(x) x##UL
diff --git a/arch/powerpc/include/asm/asm-const.h b/arch/powerpc/include/asm/asm-const.h
index bfb3c3534877a..392bdb1f104f4 100644
--- a/arch/powerpc/include/asm/asm-const.h
+++ b/arch/powerpc/include/asm/asm-const.h
@@ -1,7 +1,7 @@
#ifndef _ASM_POWERPC_ASM_CONST_H
#define _ASM_POWERPC_ASM_CONST_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define stringify_in_c(...) __VA_ARGS__
# define ASM_CONST(x) x
#else
diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
index b95b666f03744..9e9833faa4af8 100644
--- a/arch/powerpc/include/asm/barrier.h
+++ b/arch/powerpc/include/asm/barrier.h
@@ -7,7 +7,7 @@
#include <asm/asm-const.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ppc-opcode.h>
#endif
diff --git a/arch/powerpc/include/asm/book3s/32/kup.h b/arch/powerpc/include/asm/book3s/32/kup.h
index 4e14a5427a632..873c5146e3261 100644
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -7,7 +7,7 @@
#include <asm/mmu.h>
#include <asm/synch.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC_KUAP
@@ -170,6 +170,6 @@ __bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
#endif /* CONFIG_PPC_KUAP */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_32_KUP_H */
diff --git a/arch/powerpc/include/asm/book3s/32/mmu-hash.h b/arch/powerpc/include/asm/book3s/32/mmu-hash.h
index 78c6a5fde1d61..8435bf3cdabfa 100644
--- a/arch/powerpc/include/asm/book3s/32/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/32/mmu-hash.h
@@ -29,7 +29,7 @@
#define BPP_RX 0x01 /* Read only */
#define BPP_RW 0x02 /* Read/write */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Contort a phys_addr_t into the right format/bits for a BAT */
#ifdef CONFIG_PHYS_64BIT
#define BAT_PHYS_ADDR(x) ((u32)((x & 0x00000000fffe0000ULL) | \
@@ -47,7 +47,7 @@ struct ppc_bat {
u32 batu;
u32 batl;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Hash table
@@ -64,7 +64,7 @@ struct ppc_bat {
#define SR_KP 0x20000000 /* User key */
#define SR_KS 0x40000000 /* Supervisor key */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
@@ -225,7 +225,7 @@ static __always_inline void update_user_segments(u32 val)
int __init find_free_bat(void);
unsigned int bat_block_size(unsigned long base, unsigned long top);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* We happily ignore the smaller BATs on 601, we don't actually use
* those definitions on hash32 at the moment anyway
diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
index 42c3af90d1f0f..61803855b0aad 100644
--- a/arch/powerpc/include/asm/book3s/32/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
@@ -102,7 +102,7 @@
#define PMD_CACHE_INDEX PMD_INDEX_SIZE
#define PUD_CACHE_INDEX PUD_INDEX_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define PTE_TABLE_SIZE (sizeof(pte_t) << PTE_INDEX_SIZE)
#define PMD_TABLE_SIZE 0
#define PUD_TABLE_SIZE 0
@@ -110,7 +110,7 @@
/* Bits to mask out from a PMD to get to the PTE page */
#define PMD_MASKED_BITS (PTE_TABLE_SIZE - 1)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
#define PTRS_PER_PGD (1 << PGD_INDEX_SIZE)
@@ -132,12 +132,12 @@
#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
void unmap_kernel_page(unsigned long va);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* This is the bottom of the PKMAP area with HIGHMEM or an arbitrary
@@ -199,7 +199,7 @@ void unmap_kernel_page(unsigned long va);
#define MODULES_SIZE (CONFIG_MODULES_SIZE * SZ_1M)
#define MODULES_VADDR (MODULES_END - MODULES_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sched.h>
#include <linux/threads.h>
@@ -602,6 +602,6 @@ static inline pgprot_t pgprot_writecombine(pgprot_t prot)
return pgprot_noncached_wc(prot);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_32_PGTABLE_H */
diff --git a/arch/powerpc/include/asm/book3s/64/hash-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h
index aa90a048f319a..956abb391e7d8 100644
--- a/arch/powerpc/include/asm/book3s/64/hash-4k.h
+++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h
@@ -32,7 +32,7 @@
*/
#define H_KERN_VIRT_START ASM_CONST(0xc0003d0000000000)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define H_PTE_TABLE_SIZE (sizeof(pte_t) << H_PTE_INDEX_SIZE)
#define H_PMD_TABLE_SIZE (sizeof(pmd_t) << H_PMD_INDEX_SIZE)
#define H_PUD_TABLE_SIZE (sizeof(pud_t) << H_PUD_INDEX_SIZE)
@@ -174,6 +174,6 @@ static inline pmd_t hash__pmd_mkdevmap(pmd_t pmd)
return pmd;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_HASH_4K_H */
diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h
index 0bf6fd0bf42ae..9c54d59ee8251 100644
--- a/arch/powerpc/include/asm/book3s/64/hash-64k.h
+++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h
@@ -79,7 +79,7 @@
#endif
#define H_PMD_FRAG_NR (PAGE_SIZE >> H_PMD_FRAG_SIZE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/errno.h>
/*
@@ -286,6 +286,6 @@ static inline pmd_t hash__pmd_mkdevmap(pmd_t pmd)
return __pmd(pmd_val(pmd) | (_PAGE_PTE | H_PAGE_THP_HUGE | _PAGE_DEVMAP));
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_HASH_64K_H */
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h
index 0755f2567021d..5a8cbd496731e 100644
--- a/arch/powerpc/include/asm/book3s/64/hash.h
+++ b/arch/powerpc/include/asm/book3s/64/hash.h
@@ -112,7 +112,7 @@
#define H_PMD_BAD_BITS (PTE_TABLE_SIZE-1)
#define H_PUD_BAD_BITS (PMD_TABLE_SIZE-1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline int get_region_id(unsigned long ea)
{
int region_id;
@@ -295,6 +295,6 @@ int hash__create_section_mapping(unsigned long start, unsigned long end,
int nid, pgprot_t prot);
int hash__remove_section_mapping(unsigned long start, unsigned long end);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_BOOK3S_64_HASH_H */
diff --git a/arch/powerpc/include/asm/book3s/64/kup.h b/arch/powerpc/include/asm/book3s/64/kup.h
index 497a7bd31ecc0..03aec3c6c851c 100644
--- a/arch/powerpc/include/asm/book3s/64/kup.h
+++ b/arch/powerpc/include/asm/book3s/64/kup.h
@@ -10,7 +10,7 @@
#define AMR_KUEP_BLOCKED UL(0x5455555555555555)
#define AMR_KUAP_BLOCKED (AMR_KUAP_BLOCK_READ | AMR_KUAP_BLOCK_WRITE)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro kuap_user_restore gpr1, gpr2
#if defined(CONFIG_PPC_PKEY)
@@ -191,7 +191,7 @@
#endif
.endm
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <linux/jump_label.h>
#include <linux/sched.h>
@@ -413,6 +413,6 @@ static __always_inline void restore_user_access(unsigned long flags)
if (static_branch_unlikely(&uaccess_flush_key) && flags == AMR_KUAP_BLOCKED)
do_uaccess_flush();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_KUP_H */
diff --git a/arch/powerpc/include/asm/book3s/64/mmu-hash.h b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
index 1c4eebbc69c94..3463514232071 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h
@@ -130,7 +130,7 @@
#define POWER9_TLB_SETS_HASH 256 /* # sets in POWER9 TLB Hash mode */
#define POWER9_TLB_SETS_RADIX 128 /* # sets in POWER9 TLB Radix mode */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mmu_hash_ops {
void (*hpte_invalidate)(unsigned long slot,
@@ -220,7 +220,7 @@ static inline unsigned long get_sllp_encoding(int psize)
return sllp;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Segment sizes.
@@ -248,7 +248,7 @@ static inline unsigned long get_sllp_encoding(int psize)
#define LP_BITS 8
#define LP_MASK(i) ((0xFF >> (i)) << LP_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline int slb_vsid_shift(int ssize)
{
@@ -532,7 +532,7 @@ void slb_set_size(u16 size);
static inline void slb_set_size(u16 size) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* VSID allocation (256MB segment)
@@ -668,7 +668,7 @@ static inline void slb_set_size(u16 size) { }
#define SLICE_ARRAY_SIZE (H_PGTABLE_RANGE >> 41)
#define LOW_SLICE_ARRAY_SZ (BITS_PER_LONG / BITS_PER_BYTE)
#define TASK_SLICE_ARRAY_SZ(x) ((x)->hash_context->slb_addr_limit >> 41)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC_SUBPAGE_PROT
/*
@@ -881,5 +881,5 @@ static inline unsigned long mk_vsid_data(unsigned long ea, int ssize,
return __mk_vsid_data(get_kernel_vsid(ea, ssize), ssize, flags);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_MMU_HASH_H_ */
diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
index fedbc5d381917..48631365b48cf 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -4,7 +4,7 @@
#include <asm/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Page size definition
*
@@ -26,12 +26,12 @@ struct mmu_psize_def {
};
};
extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* 64-bit classic hash table MMU */
#include <asm/book3s/64/mmu-hash.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* ISA 3.0 partition and process table entry format
*/
@@ -288,5 +288,5 @@ static inline unsigned long get_user_vsid(mm_context_t *ctx,
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_MMU_H_ */
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-64k.h b/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
index 4d8d7b4ea16ba..004a03e97e58e 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_64K_H
#define _ASM_POWERPC_BOOK3S_64_PGTABLE_64K_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_HUGETLB_PAGE
#endif /* CONFIG_HUGETLB_PAGE */
@@ -14,5 +14,5 @@ static inline int remap_4k_pfn(struct vm_area_struct *vma, unsigned long addr,
BUG();
return hash__remap_4k_pfn(vma, addr, pfn, prot);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /*_ASM_POWERPC_BOOK3S_64_PGTABLE_64K_H */
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
index 6d98e6f08d4de..a9b8c7c13d1f8 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -4,7 +4,7 @@
#include <asm-generic/pgtable-nop4d.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mmdebug.h>
#include <linux/bug.h>
#include <linux/sizes.h>
@@ -144,7 +144,7 @@
#define PAGE_KERNEL_RO __pgprot(_PAGE_BASE | _PAGE_KERNEL_RO)
#define PAGE_KERNEL_ROX __pgprot(_PAGE_BASE | _PAGE_KERNEL_ROX)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* page table defines
*/
@@ -292,7 +292,7 @@ static inline unsigned long pud_leaf_size(pud_t pud)
else
return PUD_SIZE;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <asm/book3s/64/hash.h>
#include <asm/book3s/64/radix.h>
@@ -328,7 +328,7 @@ static inline unsigned long pud_leaf_size(pud_t pud)
#define FIXADDR_SIZE SZ_32M
#define FIXADDR_TOP (IOREMAP_END + FIXADDR_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline unsigned long pte_update(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, unsigned long clr,
@@ -1431,5 +1431,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va
return false;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */
diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h
index 8f55ff74bb680..ed2dc7fb97bbf 100644
--- a/arch/powerpc/include/asm/book3s/64/radix.h
+++ b/arch/powerpc/include/asm/book3s/64/radix.h
@@ -4,7 +4,7 @@
#include <asm/asm-const.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cmpxchg.h>
#endif
@@ -14,7 +14,7 @@
#include <asm/book3s/64/radix-4k.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/book3s/64/tlbflush-radix.h>
#include <asm/cpu_has_feature.h>
#endif
@@ -132,7 +132,7 @@
#define RADIX_VMEMMAP_SIZE RADIX_KERN_MAP_SIZE
#define RADIX_VMEMMAP_END (RADIX_VMEMMAP_START + RADIX_VMEMMAP_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define RADIX_PTE_TABLE_SIZE (sizeof(pte_t) << RADIX_PTE_INDEX_SIZE)
#define RADIX_PMD_TABLE_SIZE (sizeof(pmd_t) << RADIX_PMD_INDEX_SIZE)
#define RADIX_PUD_TABLE_SIZE (sizeof(pud_t) << RADIX_PUD_INDEX_SIZE)
@@ -372,5 +372,5 @@ int __meminit vmemmap_populate_compound_pages(unsigned long start_pfn,
unsigned long start,
unsigned long end, int node,
struct dev_pagemap *pgmap);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/powerpc/include/asm/book3s/64/slice.h b/arch/powerpc/include/asm/book3s/64/slice.h
index 5fbe18544cbd1..6e2f7a74cd759 100644
--- a/arch/powerpc/include/asm/book3s/64/slice.h
+++ b/arch/powerpc/include/asm/book3s/64/slice.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H
#define _ASM_POWERPC_BOOK3S_64_SLICE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC_64S_HASH_MMU
#ifdef CONFIG_HUGETLB_PAGE
@@ -37,6 +37,6 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
void slice_init_new_context_exec(struct mm_struct *mm);
void slice_setup_new_exec(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */
diff --git a/arch/powerpc/include/asm/bug.h b/arch/powerpc/include/asm/bug.h
index 1db485aacbd9b..bbaa7e81f8213 100644
--- a/arch/powerpc/include/asm/bug.h
+++ b/arch/powerpc/include/asm/bug.h
@@ -7,7 +7,7 @@
#ifdef CONFIG_BUG
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#ifdef CONFIG_DEBUG_BUGVERBOSE
.macro EMIT_BUG_ENTRY addr,file,line,flags
@@ -31,7 +31,7 @@
.endm
#endif /* verbose */
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
/* _EMIT_BUG_ENTRY expects args %0,%1,%2,%3 to be FILE, LINE, flags and
sizeof(struct bug_entry), respectively */
#ifdef CONFIG_DEBUG_BUGVERBOSE
@@ -101,12 +101,12 @@
#define HAVE_ARCH_WARN_ON
#endif
-#endif /* __ASSEMBLY __ */
+#endif /* __ASSEMBLER__ */
#else
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro EMIT_BUG_ENTRY addr,file,line,flags
.endm
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define _EMIT_BUG_ENTRY
#endif
#endif /* CONFIG_BUG */
@@ -115,7 +115,7 @@
#include <asm-generic/bug.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pt_regs;
void hash__do_page_fault(struct pt_regs *);
@@ -128,7 +128,7 @@ void die_mce(const char *str, struct pt_regs *regs, long err);
extern bool die_will_crash(void);
extern void panic_flush_kmsg_start(void);
extern void panic_flush_kmsg_end(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_BUG_H */
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index 69232231d2708..6796babc4d310 100644
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
@@ -37,7 +37,7 @@
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
#endif
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#ifdef CONFIG_PPC64
struct ppc_cache_info {
@@ -145,6 +145,6 @@ static inline void iccci(void *addr)
asm volatile ("iccci 0, %0" : : "r"(addr) : "memory");
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_CACHE_H */
diff --git a/arch/powerpc/include/asm/cpu_has_feature.h b/arch/powerpc/include/asm/cpu_has_feature.h
index bf8a228229fa9..604fa3b6c33d4 100644
--- a/arch/powerpc/include/asm/cpu_has_feature.h
+++ b/arch/powerpc/include/asm/cpu_has_feature.h
@@ -2,7 +2,7 @@
#ifndef __ASM_POWERPC_CPU_HAS_FEATURE_H
#define __ASM_POWERPC_CPU_HAS_FEATURE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <asm/cputable.h>
@@ -51,5 +51,5 @@ static __always_inline bool cpu_has_feature(unsigned long feature)
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_POWERPC_CPU_HAS_FEATURE_H */
diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h
index 0cce5dc7fb1c2..054cd2fcfd551 100644
--- a/arch/powerpc/include/asm/cpuidle.h
+++ b/arch/powerpc/include/asm/cpuidle.h
@@ -68,7 +68,7 @@
#define ERR_EC_ESL_MISMATCH -1
#define ERR_DEEP_STATE_ESL_MISMATCH -2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define PNV_IDLE_NAME_LEN 16
struct pnv_idle_states_t {
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 29a529d2ab8b4..ec16c12296da8 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -7,7 +7,7 @@
#include <uapi/asm/cputable.h>
#include <asm/asm-const.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* This structure can grow, it's real size is used by head.S code
* via the mkdefs mechanism.
@@ -103,7 +103,7 @@ extern void cpu_feature_keys_init(void);
static inline void cpu_feature_keys_init(void) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* CPU kernel features */
@@ -195,7 +195,7 @@ static inline void cpu_feature_keys_init(void) { }
#define CPU_FTR_DEXCR_NPHIE LONG_ASM_CONST(0x0010000000000000)
#define CPU_FTR_P11_PVR LONG_ASM_CONST(0x0020000000000000)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define CPU_FTR_PPCAS_ARCH_V2 (CPU_FTR_NOEXECUTE)
@@ -602,6 +602,6 @@ enum {
*/
#define HBP_NUM_MAX 2
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_POWERPC_CPUTABLE_H */
diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h
index f26c430f39826..d06f2b20b8105 100644
--- a/arch/powerpc/include/asm/cputhreads.h
+++ b/arch/powerpc/include/asm/cputhreads.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_CPUTHREADS_H
#define _ASM_POWERPC_CPUTHREADS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
#include <asm/cpu_has_feature.h>
@@ -107,7 +107,7 @@ static inline u32 get_tensr(void)
void book3e_start_thread(int thread, unsigned long addr);
void book3e_stop_thread(int thread);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define INVALID_THREAD_HWID 0x0fff
diff --git a/arch/powerpc/include/asm/dcr-generic.h b/arch/powerpc/include/asm/dcr-generic.h
index 099c28dd40b99..2d8bcff0f2f82 100644
--- a/arch/powerpc/include/asm/dcr-generic.h
+++ b/arch/powerpc/include/asm/dcr-generic.h
@@ -7,7 +7,7 @@
#ifndef _ASM_POWERPC_DCR_GENERIC_H
#define _ASM_POWERPC_DCR_GENERIC_H
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum host_type_t {DCR_HOST_MMIO, DCR_HOST_NATIVE, DCR_HOST_INVALID};
@@ -29,7 +29,7 @@ extern u32 dcr_read_generic(dcr_host_t host, unsigned int dcr_n);
extern void dcr_write_generic(dcr_host_t host, unsigned int dcr_n, u32 value);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_DCR_GENERIC_H */
diff --git a/arch/powerpc/include/asm/dcr-native.h b/arch/powerpc/include/asm/dcr-native.h
index a92059964579b..65b3fc2dc4043 100644
--- a/arch/powerpc/include/asm/dcr-native.h
+++ b/arch/powerpc/include/asm/dcr-native.h
@@ -7,7 +7,7 @@
#ifndef _ASM_POWERPC_DCR_NATIVE_H
#define _ASM_POWERPC_DCR_NATIVE_H
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/spinlock.h>
#include <asm/cputable.h>
@@ -139,6 +139,6 @@ static inline void __dcri_clrset(int base_addr, int base_data, int reg,
DCRN_ ## base ## _CONFIG_DATA, \
reg, clr, set)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_DCR_NATIVE_H */
diff --git a/arch/powerpc/include/asm/dcr.h b/arch/powerpc/include/asm/dcr.h
index 64030e3a1f307..f3bc06144a44e 100644
--- a/arch/powerpc/include/asm/dcr.h
+++ b/arch/powerpc/include/asm/dcr.h
@@ -7,7 +7,7 @@
#ifndef _ASM_POWERPC_DCR_H
#define _ASM_POWERPC_DCR_H
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC_DCR
#ifdef CONFIG_PPC_DCR_NATIVE
@@ -60,6 +60,6 @@ extern unsigned int dcr_resource_start(const struct device_node *np,
extern unsigned int dcr_resource_len(const struct device_node *np,
unsigned int index);
#endif /* CONFIG_PPC_DCR */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_DCR_H */
diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h
index cdf3c6df5123a..8fc5aaa4bbbad 100644
--- a/arch/powerpc/include/asm/epapr_hcalls.h
+++ b/arch/powerpc/include/asm/epapr_hcalls.h
@@ -52,7 +52,7 @@
#include <uapi/asm/epapr_hcalls.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/errno.h>
#include <asm/byteorder.h>
@@ -571,5 +571,5 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1,
in[3] = p4;
return epapr_hypercall(in, out, nr);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _EPAPR_HCALLS_H */
diff --git a/arch/powerpc/include/asm/exception-64e.h b/arch/powerpc/include/asm/exception-64e.h
index b1ef1e92c34a1..1a83b1ff3578a 100644
--- a/arch/powerpc/include/asm/exception-64e.h
+++ b/arch/powerpc/include/asm/exception-64e.h
@@ -149,7 +149,7 @@ exc_##label##_book3e:
addi r11,r13,PACA_EXTLB; \
TLB_MISS_RESTORE(r11)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int interrupt_base_book3e;
#endif
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index bb6f78fcf981c..a9437e89f69f7 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -53,7 +53,7 @@
*/
#define MAX_MCE_DEPTH 4
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define STF_ENTRY_BARRIER_SLOT \
STF_ENTRY_BARRIER_FIXUP_SECTION; \
@@ -170,9 +170,9 @@
RFSCV; \
b rfscv_flush_fallback
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/* Prototype for function defined in exceptions-64s.S */
void do_uaccess_flush(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_EXCEPTION_H */
diff --git a/arch/powerpc/include/asm/extable.h b/arch/powerpc/include/asm/extable.h
index 26ce2e5c0fa8e..d483a9c24ba96 100644
--- a/arch/powerpc/include/asm/extable.h
+++ b/arch/powerpc/include/asm/extable.h
@@ -17,7 +17,7 @@
#define ARCH_HAS_RELATIVE_EXTABLE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct exception_table_entry {
int insn;
diff --git a/arch/powerpc/include/asm/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h
index 17d168dd8b491..756a6c694018c 100644
--- a/arch/powerpc/include/asm/feature-fixups.h
+++ b/arch/powerpc/include/asm/feature-fixups.h
@@ -168,7 +168,7 @@ label##5: \
#define ALT_FW_FTR_SECTION_END_IFCLR(msk) \
ALT_FW_FTR_SECTION_END_NESTED_IFCLR(msk, 97)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define ASM_FTR_IF(section_if, section_else, msk, val) \
stringify_in_c(BEGIN_FTR_SECTION) \
@@ -196,7 +196,7 @@ label##5: \
#define ASM_MMU_FTR_IFCLR(section_if, section_else, msk) \
ASM_MMU_FTR_IF(section_if, section_else, (msk), 0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* LWSYNC feature sections */
#define START_LWSYNC_SECTION(label) label##1:
@@ -276,7 +276,7 @@ label##3: \
FTR_ENTRY_OFFSET 956b-957b; \
.popsection;
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
extern long stf_barrier_fallback;
diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
index 69ae9cf57d50b..abd7c56f4d55c 100644
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
@@ -58,7 +58,7 @@
#define FW_FEATURE_WATCHDOG ASM_CONST(0x0000080000000000)
#define FW_FEATURE_PLPKS ASM_CONST(0x0000100000000000)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum {
#ifdef CONFIG_PPC64
@@ -146,6 +146,6 @@ void pseries_probe_fw_features(void);
static inline void pseries_probe_fw_features(void) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* __ASM_POWERPC_FIRMWARE_H */
diff --git a/arch/powerpc/include/asm/fixmap.h b/arch/powerpc/include/asm/fixmap.h
index f9068dd8dfce7..bc5109eab5b74 100644
--- a/arch/powerpc/include/asm/fixmap.h
+++ b/arch/powerpc/include/asm/fixmap.h
@@ -14,7 +14,7 @@
#ifndef _ASM_FIXMAP_H
#define _ASM_FIXMAP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sizes.h>
#include <linux/pgtable.h>
#include <asm/page.h>
@@ -111,5 +111,5 @@ static inline void __set_fixmap(enum fixed_addresses idx,
#define VIRT_IMMR_BASE (__fix_to_virt(FIX_IMMR_BASE))
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index 82da7c7a1d125..bd61a230b19d0 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -15,7 +15,7 @@
#define FTRACE_MCOUNT_MAX_OFFSET 8
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void _mcount(void);
unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,
@@ -69,14 +69,14 @@ struct ftrace_ops;
void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
struct ftrace_ops *op, struct ftrace_regs *fregs);
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
#define ARCH_SUPPORTS_FTRACE_OPS 1
#endif
#endif /* CONFIG_FUNCTION_TRACER */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_FTRACE_SYSCALLS
/*
* Some syscall entry functions on powerpc start with "ppc_" (fork and clone,
@@ -160,6 +160,6 @@ static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, unsi
static inline void ftrace_free_init_tramp(void) { }
static inline unsigned long ftrace_call_adjust(unsigned long addr) { return addr; }
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_FTRACE */
diff --git a/arch/powerpc/include/asm/head-64.h b/arch/powerpc/include/asm/head-64.h
index d73153b0275d6..3966bd5810cb6 100644
--- a/arch/powerpc/include/asm/head-64.h
+++ b/arch/powerpc/include/asm/head-64.h
@@ -4,7 +4,7 @@
#include <asm/cache.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* We can't do CPP stringification and concatination directly into the section
* name for some reason, so these macros can do it for us.
@@ -167,6 +167,6 @@ end_##sname:
// find label from _within_ sname
#define ABS_ADDR(label, sname) (label - start_ ## sname + sname ## _start)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_HEAD_64_H */
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 65d1f291393d2..8d6c0e3f641eb 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -498,7 +498,7 @@
#define H_GUEST_CAP_POWER11 (1UL<<(63-3))
#define H_GUEST_CAP_BITMAP2 (1UL<<(63-63))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
/**
@@ -699,6 +699,6 @@ struct hv_gpci_request_buffer {
uint8_t bytes[HGPCI_MAX_DATA_BYTES];
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_HVCALL_H */
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 569ac1165b069..1078ba88efaf4 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -59,7 +59,7 @@
#define IRQS_PMI_DISABLED 2
#define IRQS_ALL_DISABLED (IRQS_DISABLED | IRQS_PMI_DISABLED)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void __hard_irq_enable(void)
{
@@ -516,6 +516,6 @@ static inline unsigned long mtmsr_isync_irqsafe(unsigned long msr)
#define ARCH_IRQ_INIT_FLAGS IRQ_NOREQUEST
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_HW_IRQ_H */
diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index 23638d4e73ac0..eb0e4a20b8188 100644
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -64,7 +64,7 @@
#define INTERRUPT_DATA_LOAD_TLB_MISS_603 0x1100
#define INTERRUPT_DATA_STORE_TLB_MISS_603 0x1200
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/context_tracking.h>
#include <linux/hardirq.h>
@@ -675,6 +675,6 @@ unsigned long interrupt_exit_user_restart(struct pt_regs *regs);
unsigned long interrupt_exit_kernel_restart(struct pt_regs *regs);
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_INTERRUPT_H */
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
index 47d46712928ac..1351fb40fe749 100644
--- a/arch/powerpc/include/asm/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -5,7 +5,7 @@
#ifndef _ASM_IRQFLAGS_H
#define _ASM_IRQFLAGS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Get definitions for arch_local_save_flags(x), etc.
*/
diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h
index 2f2a86ed2280a..d4eaba459a0ed 100644
--- a/arch/powerpc/include/asm/jump_label.h
+++ b/arch/powerpc/include/asm/jump_label.h
@@ -6,7 +6,7 @@
* Copyright 2010 Michael Ellerman, IBM Corp.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/feature-fixups.h>
diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h
index b5bbb94c51f6d..db12149446224 100644
--- a/arch/powerpc/include/asm/kasan.h
+++ b/arch/powerpc/include/asm/kasan.h
@@ -12,7 +12,7 @@
#define EXPORT_SYMBOL_KASAN(fn)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/page.h>
#include <linux/sizes.h>
@@ -80,5 +80,5 @@ void kasan_update_early_region(unsigned long k_start, unsigned long k_end, pte_t
int kasan_init_shadow_page_tables(unsigned long k_start, unsigned long k_end);
int kasan_init_region(void *start, size_t size);
-#endif /* __ASSEMBLY */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/powerpc/include/asm/kdump.h b/arch/powerpc/include/asm/kdump.h
index fd128d1e52b3b..802644178f432 100644
--- a/arch/powerpc/include/asm/kdump.h
+++ b/arch/powerpc/include/asm/kdump.h
@@ -31,7 +31,7 @@
#endif /* CONFIG_CRASH_DUMP */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if defined(CONFIG_CRASH_DUMP) && !defined(CONFIG_NONSTATIC_KERNEL)
extern void reserve_kdump_trampoline(void);
@@ -42,6 +42,6 @@ static inline void reserve_kdump_trampoline(void) { ; }
static inline void setup_kdump_trampoline(void) { ; }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __PPC64_KDUMP_H */
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 601e569303e1b..23fe1560d5444 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -49,7 +49,7 @@
#define KEXEC_STATE_IRQS_OFF 1
#define KEXEC_STATE_REAL_MODE 2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/reg.h>
typedef void (*crash_shutdown_t)(void);
@@ -208,6 +208,6 @@ static inline void reset_sprs(void)
}
#endif
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_KEXEC_H */
diff --git a/arch/powerpc/include/asm/kgdb.h b/arch/powerpc/include/asm/kgdb.h
index 715c18b753346..f39531903325a 100644
--- a/arch/powerpc/include/asm/kgdb.h
+++ b/arch/powerpc/include/asm/kgdb.h
@@ -21,7 +21,7 @@
#ifndef __POWERPC_KGDB_H__
#define __POWERPC_KGDB_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define BREAK_INSTR_SIZE 4
#define BUFMAX ((NUMREGBYTES * 2) + 512)
@@ -62,6 +62,6 @@ static inline void arch_kgdb_breakpoint(void)
/* CR/LR, R1, R2, R13-R31 inclusive. */
#define NUMCRITREGBYTES (23 * sizeof(int))
#endif /* 32/64 */
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !__POWERPC_KGDB_H__ */
#endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index 2bb03d941e3e8..dab63b82a8d4f 100644
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -6,7 +6,7 @@
#define KUAP_WRITE 2
#define KUAP_READ_WRITE (KUAP_READ | KUAP_WRITE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
static __always_inline bool kuap_is_disabled(void);
@@ -28,14 +28,14 @@ static __always_inline bool kuap_is_disabled(void);
#include <asm/book3s/32/kup.h>
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifndef CONFIG_PPC_KUAP
.macro kuap_check_amr gpr1, gpr2
.endm
#endif
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
extern bool disable_kuep;
extern bool disable_kuap;
@@ -181,6 +181,6 @@ static __always_inline void prevent_current_write_to_user(void)
prevent_user_access(KUAP_WRITE);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_KUAP_H_ */
diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h
index d68d71987d5cf..f9af8df090775 100644
--- a/arch/powerpc/include/asm/kvm_asm.h
+++ b/arch/powerpc/include/asm/kvm_asm.h
@@ -9,7 +9,7 @@
#ifndef __POWERPC_KVM_ASM_H__
#define __POWERPC_KVM_ASM_H__
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_64BIT
#define PPC_STD(sreg, offset, areg) std sreg, (offset)(areg)
#define PPC_LD(treg, offset, areg) ld treg, (offset)(areg)
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h
index a36797938620f..3435fe144908f 100644
--- a/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -20,7 +20,7 @@
/* Maximum number of subcores per physical core */
#define MAX_SUBCORES 4
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_KVM_BOOK3S_HANDLER
@@ -58,7 +58,7 @@ kvmppc_resume_\intno:
#endif /* CONFIG_KVM_BOOK3S_HANDLER */
-#else /*__ASSEMBLY__ */
+#else /*__ASSEMBLER__ */
struct kvmppc_vcore;
@@ -150,7 +150,7 @@ struct kvmppc_book3s_shadow_vcpu {
#endif
};
-#endif /*__ASSEMBLY__ */
+#endif /*__ASSEMBLER__ */
/* Values for kvm_state */
#define KVM_HWTHREAD_IN_KERNEL 0
diff --git a/arch/powerpc/include/asm/kvm_booke_hv_asm.h b/arch/powerpc/include/asm/kvm_booke_hv_asm.h
index 7487ef5821210..3acf2995d364c 100644
--- a/arch/powerpc/include/asm/kvm_booke_hv_asm.h
+++ b/arch/powerpc/include/asm/kvm_booke_hv_asm.h
@@ -8,7 +8,7 @@
#include <asm/feature-fixups.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* All exceptions from guest state must go through KVM
@@ -64,5 +64,5 @@ END_FTR_SECTION_IFSET(CPU_FTR_EMB_HV)
#endif
.endm
-#endif /*__ASSEMBLY__ */
+#endif /*__ASSEMBLER__ */
#endif /* ASM_KVM_BOOKE_HV_ASM_H */
diff --git a/arch/powerpc/include/asm/lv1call.h b/arch/powerpc/include/asm/lv1call.h
index b11501b30193b..ae70120953a85 100644
--- a/arch/powerpc/include/asm/lv1call.h
+++ b/arch/powerpc/include/asm/lv1call.h
@@ -10,7 +10,7 @@
#if !defined(_ASM_POWERPC_LV1CALL_H)
#define _ASM_POWERPC_LV1CALL_H
-#if !defined(__ASSEMBLY__)
+#if !defined(__ASSEMBLER__)
#include <linux/types.h>
#include <linux/export.h>
@@ -211,7 +211,7 @@
{return _lv1_##name(LV1_##in##_IN_##out##_OUT_ARGS);}
#endif
-#endif /* !defined(__ASSEMBLY__) */
+#endif /* !defined(__ASSEMBLER__) */
/* lv1 call table */
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 4182d68d9cd17..5f9c5d436e171 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -137,7 +137,7 @@
MMU_FTR_CI_LARGE_PAGE
#define MMU_FTRS_PA6T MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \
MMU_FTR_CI_LARGE_PAGE | MMU_FTR_NO_SLBIE_B
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <asm/cputable.h>
#include <asm/page.h>
@@ -332,7 +332,7 @@ static inline bool strict_module_rwx_enabled(void)
{
return IS_ENABLED(CONFIG_STRICT_MODULE_RWX) && strict_kernel_rwx_enabled();
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* The kernel use the constants below to index in the page sizes array.
* The use of fixed constants for this purpose is better for performances
@@ -377,7 +377,7 @@ static inline bool strict_module_rwx_enabled(void)
#include <asm/book3s/64/mmu.h>
#else /* CONFIG_PPC_BOOK3S_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* MMU initialization */
extern void early_init_mmu(void);
extern void early_init_mmu_secondary(void);
@@ -388,7 +388,7 @@ static inline void mmu_early_init_devtree(void) { }
static inline void pkey_early_init_devtree(void) {}
extern void *abatron_pteptrs[2];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
#if defined(CONFIG_PPC_BOOK3S_32)
diff --git a/arch/powerpc/include/asm/mpc52xx.h b/arch/powerpc/include/asm/mpc52xx.h
index 01ae6c351e502..d7ffbd06797d2 100644
--- a/arch/powerpc/include/asm/mpc52xx.h
+++ b/arch/powerpc/include/asm/mpc52xx.h
@@ -13,10 +13,10 @@
#ifndef __ASM_POWERPC_MPC52xx_H__
#define __ASM_POWERPC_MPC52xx_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <asm/mpc5xxx.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <linux/suspend.h>
@@ -30,7 +30,7 @@
/* Structures mapping of some unit register set */
/* ======================================================================== */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Memory Mapping Control */
struct mpc52xx_mmap_ctl {
@@ -258,14 +258,14 @@ struct mpc52xx_intr {
u32 per_error; /* INTR + 0x38 */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* ========================================================================= */
/* Prototypes for MPC52xx sysdev */
/* ========================================================================= */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct device_node;
@@ -297,7 +297,7 @@ extern void __init mpc52xx_setup_pci(void);
static inline void mpc52xx_setup_pci(void) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_PM
struct mpc52xx_suspend {
diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
index 46bc5925e5fdc..08486b15b2075 100644
--- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
@@ -7,7 +7,7 @@
#ifdef CONFIG_PPC_KUAP
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/reg.h>
@@ -82,7 +82,7 @@ __bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
return !((regs->kuap ^ MD_APG_KUAP) & 0xff000000);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* CONFIG_PPC_KUAP */
diff --git a/arch/powerpc/include/asm/nohash/32/mmu-44x.h b/arch/powerpc/include/asm/nohash/32/mmu-44x.h
index 2d92a39d8f2e8..c3d1921943244 100644
--- a/arch/powerpc/include/asm/nohash/32/mmu-44x.h
+++ b/arch/powerpc/include/asm/nohash/32/mmu-44x.h
@@ -100,7 +100,7 @@
#define PPC47x_TLB2_S_RW (PPC47x_TLB2_SW | PPC47x_TLB2_SR)
#define PPC47x_TLB2_IMG (PPC47x_TLB2_I | PPC47x_TLB2_M | PPC47x_TLB2_G)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int tlb_44x_hwater;
extern unsigned int tlb_44x_index;
@@ -114,7 +114,7 @@ typedef struct {
/* patch sites */
extern s32 patch__tlb_44x_hwater_D, patch__tlb_44x_hwater_I;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifndef CONFIG_PPC_EARLY_DEBUG_44x
#define PPC44x_EARLY_TLBS 1
diff --git a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
index 2986f9ba40b88..f19115db8072f 100644
--- a/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h
@@ -174,7 +174,7 @@
#define MODULES_SIZE (CONFIG_MODULES_SIZE * SZ_1M)
#define MODULES_VADDR (MODULES_END - MODULES_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mmdebug.h>
#include <linux/sizes.h>
@@ -265,6 +265,6 @@ static inline int arch_vmap_pte_supported_shift(unsigned long size)
extern s32 patch__itlbmiss_exit_1, patch__dtlbmiss_exit_1;
extern s32 patch__itlbmiss_perf, patch__dtlbmiss_perf;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_MMU_8XX_H_ */
diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h
index b481738c4bb52..2d71e4b7cd09c 100644
--- a/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/32/pgtable.h
@@ -4,12 +4,12 @@
#include <asm-generic/pgtable-nopmd.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/sched.h>
#include <linux/threads.h>
#include <asm/mmu.h> /* For sub-arch specific PPC_PIN_SIZE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define PTE_INDEX_SIZE PTE_SHIFT
#define PMD_INDEX_SIZE 0
@@ -19,14 +19,14 @@
#define PMD_CACHE_INDEX PMD_INDEX_SIZE
#define PUD_CACHE_INDEX PUD_INDEX_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define PTE_TABLE_SIZE (sizeof(pte_t) << PTE_INDEX_SIZE)
#define PMD_TABLE_SIZE 0
#define PUD_TABLE_SIZE 0
#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE)
#define PMD_MASKED_BITS (PTE_TABLE_SIZE - 1)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
#define PTRS_PER_PGD (1 << PGD_INDEX_SIZE)
@@ -149,7 +149,7 @@
#define MAX_POSSIBLE_PHYSMEM_BITS 32
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pmd_none(pmd) (!pmd_val(pmd))
#define pmd_bad(pmd) (pmd_val(pmd) & _PMD_BAD)
@@ -199,6 +199,6 @@ static inline void pmd_clear(pmd_t *pmdp)
/* We borrow LSB 2 to store the exclusive marker in swap PTEs. */
#define _PAGE_SWP_EXCLUSIVE 0x000004
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_POWERPC_NOHASH_32_PGTABLE_H */
diff --git a/arch/powerpc/include/asm/nohash/32/pte-8xx.h b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
index 54ebb91dbdcf3..e2ea8ba9f8cae 100644
--- a/arch/powerpc/include/asm/nohash/32/pte-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
@@ -83,7 +83,7 @@
#include <asm/pgtable-masks.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline pte_t pte_wrprotect(pte_t pte)
{
return __pte(pte_val(pte) | _PAGE_RO);
diff --git a/arch/powerpc/include/asm/nohash/64/pgtable-4k.h b/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
index 10f5cf444d72a..fb6fa1d4e0749 100644
--- a/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
@@ -14,12 +14,12 @@
#define PUD_INDEX_SIZE 9
#define PGD_INDEX_SIZE 9
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define PTE_TABLE_SIZE (sizeof(pte_t) << PTE_INDEX_SIZE)
#define PMD_TABLE_SIZE (sizeof(pmd_t) << PMD_INDEX_SIZE)
#define PUD_TABLE_SIZE (sizeof(pud_t) << PUD_INDEX_SIZE)
#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
#define PTRS_PER_PMD (1 << PMD_INDEX_SIZE)
@@ -57,7 +57,7 @@
#define p4d_bad(p4d) (p4d_val(p4d) == 0)
#define p4d_present(p4d) (p4d_val(p4d) != 0)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline pud_t *p4d_pgtable(p4d_t p4d)
{
@@ -80,7 +80,7 @@ static inline p4d_t pte_p4d(pte_t pte)
}
extern struct page *p4d_page(p4d_t p4d);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define pud_ERROR(e) \
pr_err("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e))
diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h
index 2202c78730e8e..2deb955b7bc89 100644
--- a/arch/powerpc/include/asm/nohash/64/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable.h
@@ -77,7 +77,7 @@
#define H_PAGE_4K_PFN 0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* pte_clear moved to later in this file */
#define PMD_BAD_BITS (PTE_TABLE_SIZE-1)
@@ -209,6 +209,6 @@ void __patch_exception(int exc, unsigned long addr);
__patch_exception((exc), (unsigned long)&name); \
} while (0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_NOHASH_64_PGTABLE_H */
diff --git a/arch/powerpc/include/asm/nohash/kup-booke.h b/arch/powerpc/include/asm/nohash/kup-booke.h
index 0c7c3258134c5..d6bbb6d78bbe4 100644
--- a/arch/powerpc/include/asm/nohash/kup-booke.h
+++ b/arch/powerpc/include/asm/nohash/kup-booke.h
@@ -7,7 +7,7 @@
#ifdef CONFIG_PPC_KUAP
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro kuap_check_amr gpr1, gpr2
.endm
@@ -105,7 +105,7 @@ __bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
return !regs->kuap;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* CONFIG_PPC_KUAP */
diff --git a/arch/powerpc/include/asm/nohash/mmu-e500.h b/arch/powerpc/include/asm/nohash/mmu-e500.h
index b281d9eeaf1e6..2fad5ff426a0a 100644
--- a/arch/powerpc/include/asm/nohash/mmu-e500.h
+++ b/arch/powerpc/include/asm/nohash/mmu-e500.h
@@ -230,7 +230,7 @@
#define MAS2_M_IF_NEEDED 0
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/bug.h>
extern unsigned int tlbcam_index;
@@ -318,6 +318,6 @@ extern int book3e_htw_mode;
#include <asm/percpu.h>
DECLARE_PER_CPU(int, next_tlbcam_idx);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_MMU_BOOK3E_H_ */
diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h
index 8d1f0b7062eb2..69d73695cd157 100644
--- a/arch/powerpc/include/asm/nohash/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/pgtable.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_NOHASH_PGTABLE_H
#define _ASM_POWERPC_NOHASH_PGTABLE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pte_t *p,
unsigned long clr, unsigned long set, int huge);
#endif
@@ -27,7 +27,7 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p
#define PAGE_KERNEL_RO __pgprot(_PAGE_BASE | _PAGE_KERNEL_RO)
#define PAGE_KERNEL_ROX __pgprot(_PAGE_BASE | _PAGE_KERNEL_ROX)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int icache_44x_need_flush;
@@ -373,5 +373,5 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);
void unmap_kernel_page(unsigned long va);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/powerpc/include/asm/nohash/pte-e500.h b/arch/powerpc/include/asm/nohash/pte-e500.h
index cb78392494da0..b61efc3ee9040 100644
--- a/arch/powerpc/include/asm/nohash/pte-e500.h
+++ b/arch/powerpc/include/asm/nohash/pte-e500.h
@@ -86,7 +86,7 @@
#include <asm/pgtable-masks.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline pte_t pte_mkexec(pte_t pte)
{
return __pte((pte_val(pte) & ~_PAGE_BAP_SX) | _PAGE_BAP_UX);
@@ -134,7 +134,7 @@ static inline unsigned long pud_leaf_size(pud_t pud)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_NOHASH_PTE_E500_H */
diff --git a/arch/powerpc/include/asm/opal-api.h b/arch/powerpc/include/asm/opal-api.h
index 8c9d4b26bf579..d3eaa34257970 100644
--- a/arch/powerpc/include/asm/opal-api.h
+++ b/arch/powerpc/include/asm/opal-api.h
@@ -246,7 +246,7 @@
#define OPAL_CONFIG_IDLE_UNDO 0
#define OPAL_CONFIG_IDLE_APPLY 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Other enums */
enum OpalFreezeState {
@@ -1183,6 +1183,6 @@ struct opal_mpipl_fadump {
struct opal_mpipl_region region[];
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __OPAL_API_H */
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index af304e6cb486c..0a398265ba04e 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -10,7 +10,7 @@
#include <asm/opal-api.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/notifier.h>
@@ -390,6 +390,6 @@ void opal_powercap_init(void);
void opal_psr_init(void);
void opal_sensor_groups_init(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_OPAL_H */
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index af9a2628d1df0..b28fbb1d57eb9 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -6,7 +6,7 @@
* Copyright (C) 2001,2005 IBM Corporation.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/bug.h>
@@ -23,7 +23,7 @@
*/
#include <vdso/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef CONFIG_HUGETLB_PAGE
#define HPAGE_SHIFT PAGE_SHIFT
#elif defined(CONFIG_PPC_BOOK3S_64)
@@ -75,7 +75,7 @@ extern unsigned int hpage_shift;
#define LOAD_OFFSET ASM_CONST((CONFIG_KERNEL_START-CONFIG_PHYSICAL_START))
#if defined(CONFIG_NONSTATIC_KERNEL)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern phys_addr_t memstart_addr;
extern phys_addr_t kernstart_addr;
@@ -84,7 +84,7 @@ extern phys_addr_t kernstart_addr;
extern long long virt_phys_offset;
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define PHYSICAL_START kernstart_addr
#else /* !CONFIG_NONSTATIC_KERNEL */
@@ -216,7 +216,7 @@ extern long long virt_phys_offset;
#endif
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline unsigned long virt_to_pfn(const void *kaddr)
{
return __pa(kaddr) >> PAGE_SHIFT;
@@ -261,7 +261,7 @@ static inline const void *pfn_to_kaddr(unsigned long pfn)
#define is_kernel_addr(x) ((x) >= TASK_SIZE)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC_BOOK3S_64
#include <asm/pgtable-be-types.h>
@@ -290,6 +290,6 @@ static inline unsigned long kaslr_offset(void)
}
#include <asm-generic/memory_model.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_PAGE_H */
diff --git a/arch/powerpc/include/asm/page_32.h b/arch/powerpc/include/asm/page_32.h
index b9ac9e3a771cb..25482405a8111 100644
--- a/arch/powerpc/include/asm/page_32.h
+++ b/arch/powerpc/include/asm/page_32.h
@@ -19,7 +19,7 @@
#define PTE_SHIFT (PAGE_SHIFT - PTE_T_LOG2) /* full page */
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The basic type of a PTE - 64 bits for those CPUs with > 32 bit
* physical addressing.
@@ -53,6 +53,6 @@ extern void copy_page(void *to, void *from);
#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_PAGE_32_H */
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
index 79a9b7c6a132c..0f564a06bf684 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
@@ -35,7 +35,7 @@
#define ESID_MASK_1T 0xffffff0000000000UL
#define GET_ESID_1T(x) (((x) >> SID_SHIFT_1T) & SID_MASK_1T)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cache.h>
typedef unsigned long pte_basic_t;
@@ -82,7 +82,7 @@ extern void copy_page(void *to, void *from);
/* Log 2 of page table size */
extern u64 ppc64_pft_size;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define VM_DATA_DEFAULT_FLAGS \
(is_32bit_task() ? \
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
index 2f72ad885332e..0736234064b10 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_PGTABLE_H
#define _ASM_POWERPC_PGTABLE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mmdebug.h>
#include <linux/mmzone.h>
#include <asm/processor.h> /* For TASK_SIZE */
@@ -12,7 +12,7 @@
struct mm_struct;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_PPC_BOOK3S
#include <asm/book3s/pgtable.h>
@@ -39,7 +39,7 @@ struct mm_struct;
#define PAGE_AGP (PAGE_KERNEL_NC)
#define HAVE_PAGE_AGP
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define PFN_PTE_SHIFT PTE_RPN_SHIFT
@@ -215,6 +215,6 @@ static inline bool arch_supports_memmap_on_memory(unsigned long vmemmap_size)
#endif /* CONFIG_PPC64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_PGTABLE_H */
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 02897f4b0dbf8..80d77d77a5bf0 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -12,7 +12,7 @@
#include <asm/feature-fixups.h>
#include <asm/extable.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define SZL (BITS_PER_LONG/8)
@@ -868,7 +868,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_CELL_TB_BUG, CPU_FTR_CELL_TB_BUG, 96)
#endif /* !CONFIG_PPC_BOOK3E_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define SOFT_MASK_TABLE(_start, _end) \
stringify_in_c(.section __soft_mask_table,"a";)\
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 6b94de17201c7..f156bdb43e2be 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -29,14 +29,14 @@
#ifdef CONFIG_PPC64
/* Default SMT priority is set to 3. Use 11- 13bits to save priority. */
#define PPR_PRIORITY 3
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define DEFAULT_PPR (PPR_PRIORITY << 50)
#else
#define DEFAULT_PPR ((u64)PPR_PRIORITY << 50)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_PPC64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/thread_info.h>
#include <asm/ptrace.h>
@@ -460,5 +460,5 @@ int enter_vmx_ops(void);
void *exit_vmx_ops(void *dest);
#endif /* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_PROCESSOR_H */
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 7b9350756875a..94aa1de2b06e1 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -24,7 +24,7 @@
#include <asm/asm-const.h>
#include <asm/reg.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pt_regs
{
union {
@@ -165,7 +165,7 @@ struct pt_regs
#define STACK_INT_FRAME_SIZE (KERNEL_REDZONE_SIZE + STACK_USER_INT_FRAME_SIZE)
#define STACK_INT_FRAME_MARKER_LONGS (STACK_INT_FRAME_MARKER/sizeof(long))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/paca.h>
#ifdef CONFIG_SMP
@@ -414,7 +414,7 @@ static inline unsigned long regs_get_kernel_argument(struct pt_regs *regs, unsig
return 0;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifndef __powerpc64__
/* We need PT_SOFTE defined at all time to avoid #ifdefs */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 0228c90bbcc7b..3fe1866354323 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -60,7 +60,7 @@
#define MSR_RI_LG 1 /* Recoverable Exception */
#define MSR_LE_LG 0 /* Little Endian */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __MASK(X) (1<<(X))
#else
#define __MASK(X) (1UL<<(X))
@@ -1358,7 +1358,7 @@
#define PVR_ARCH_31_P11 0x0f000007
/* Macros for setting and retrieving special purpose registers */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if defined(CONFIG_PPC64) || defined(__CHECKER__)
typedef struct {
@@ -1450,6 +1450,6 @@ extern void scom970_write(unsigned int address, unsigned long value);
struct pt_regs;
extern void ppc_save_regs(struct pt_regs *regs);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_REG_H */
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index 656bfaf91526e..56f9d3b1de859 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -576,7 +576,7 @@
#define TEN_THREAD(x) (1 << (x))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define mftmr(rn) ({unsigned long rval; \
asm volatile(MFTMR(rn, %0) : "=r" (rval)); rval;})
#define mttmr(rn, v) asm volatile(MTTMR(rn, %0) : \
@@ -585,7 +585,7 @@
extern unsigned long global_dbcr0[];
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_POWERPC_REG_BOOKE_H__ */
#endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/reg_fsl_emb.h b/arch/powerpc/include/asm/reg_fsl_emb.h
index 9893d2001b680..ec459c3d9498a 100644
--- a/arch/powerpc/include/asm/reg_fsl_emb.h
+++ b/arch/powerpc/include/asm/reg_fsl_emb.h
@@ -9,7 +9,7 @@
#include <linux/stringify.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Performance Monitor Registers */
static __always_inline unsigned int mfpmr(unsigned int rn)
{
@@ -32,7 +32,7 @@ static __always_inline void mtpmr(unsigned int rn, unsigned int val)
".machine pop;"
: [val] "=r" (val) : [rn] "i" (rn));
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* Freescale Book E Performance Monitor APU Registers */
#define PMRN_PMC0 0x010 /* Performance Monitor Counter 0 */
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index eed74c1fb832f..50a92b24628da 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -4,7 +4,7 @@
#include <uapi/asm/setup.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void ppc_printk_progress(char *s, unsigned short hex);
extern unsigned long long memory_limit;
@@ -89,7 +89,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
extern struct seq_buf ppc_hw_desc;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_SETUP_H */
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index b77927ccb0ab0..e41b9ea42122b 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -18,7 +18,7 @@
#include <linux/kernel.h>
#include <linux/irqreturn.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC64
#include <asm/paca.h>
@@ -266,7 +266,7 @@ extern char __secondary_hold;
extern unsigned int booting_thread_hwid;
extern void __early_start(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_SMP_H) */
diff --git a/arch/powerpc/include/asm/spu_csa.h b/arch/powerpc/include/asm/spu_csa.h
index c33df961c0454..1b3271a033928 100644
--- a/arch/powerpc/include/asm/spu_csa.h
+++ b/arch/powerpc/include/asm/spu_csa.h
@@ -43,7 +43,7 @@
#define SPU_DECR_STATUS_RUNNING 0x1
#define SPU_DECR_STATUS_WRAPPED 0x2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* spu_reg128 - generic 128-bit register definition.
*/
@@ -243,5 +243,5 @@ struct spu_state {
#endif /* !__SPU__ */
#endif /* __KERNEL__ */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _SPU_CSA_H_ */
diff --git a/arch/powerpc/include/asm/synch.h b/arch/powerpc/include/asm/synch.h
index b0b4c64870d77..0d3ccb34adfb2 100644
--- a/arch/powerpc/include/asm/synch.h
+++ b/arch/powerpc/include/asm/synch.h
@@ -7,7 +7,7 @@
#include <asm/feature-fixups.h>
#include <asm/ppc-opcode.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int __start___lwsync_fixup, __stop___lwsync_fixup;
extern void do_lwsync_fixups(unsigned long value, void *fixup_start,
void *fixup_end);
@@ -40,7 +40,7 @@ static inline void ppc_after_tlbiel_barrier(void)
*/
asm volatile(ASM_FTR_IFSET(PPC_CP_ABORT, "", %0) : : "i" (CPU_FTR_ARCH_31) : "memory");
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#if defined(__powerpc64__)
# define LWSYNC lwsync
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 2785c7462ebf7..b0f200aba2b3d 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -41,7 +41,7 @@
#define THREAD_ALIGN (1 << THREAD_ALIGN_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/processor.h>
#include <asm/accounting.h>
@@ -89,7 +89,7 @@ extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src
void arch_setup_new_exec(void);
#define arch_setup_new_exec arch_setup_new_exec
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* thread information flag bit numbers
@@ -162,7 +162,7 @@ void arch_setup_new_exec(void);
#define _TLF_LAZY_MMU (1 << TLF_LAZY_MMU)
#define _TLF_RUNLATCH (1 << TLF_RUNLATCH)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void clear_thread_local_flags(unsigned int flags)
{
@@ -233,7 +233,7 @@ static inline int arch_within_stack_frames(const void * const stack,
extern void *emergency_ctx[];
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/tm.h b/arch/powerpc/include/asm/tm.h
index e94f6db5e367b..d700affba4480 100644
--- a/arch/powerpc/include/asm/tm.h
+++ b/arch/powerpc/include/asm/tm.h
@@ -8,7 +8,7 @@
#include <uapi/asm/tm.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void tm_reclaim(struct thread_struct *thread,
uint8_t cause);
@@ -19,4 +19,4 @@ extern void tm_restore_sprs(struct thread_struct *thread);
extern bool tm_suspend_disabled;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index 93157a661dcc7..55d7ba6d910bd 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -11,10 +11,10 @@
#include <uapi/asm/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef __vector128 vector128;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_TYPES_H */
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 027ef94a12fbd..b873fbb6d712f 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -9,7 +9,7 @@
#define NR_syscalls __NR_syscalls
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -52,5 +52,5 @@
#define __ARCH_WANT_SYS_VFORK
#define __ARCH_WANT_SYS_CLONE
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_UNISTD_H_ */
diff --git a/arch/powerpc/include/asm/vdso.h b/arch/powerpc/include/asm/vdso.h
index 8d972bc98b55f..916c19ed68430 100644
--- a/arch/powerpc/include/asm/vdso.h
+++ b/arch/powerpc/include/asm/vdso.h
@@ -4,7 +4,7 @@
#define VDSO_VERSION_STRING LINUX_2.6.15
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_PPC64
#include <generated/vdso64-offsets.h>
@@ -20,7 +20,7 @@
int vdso_getcpu_init(void);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef __VDSO64__
#define V_FUNCTION_BEGIN(name) \
@@ -48,6 +48,6 @@ int vdso_getcpu_init(void);
#endif /* __VDSO32__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_VDSO_H */
diff --git a/arch/powerpc/include/asm/vdso/getrandom.h b/arch/powerpc/include/asm/vdso/getrandom.h
index 80ce0709725eb..bf4c537114029 100644
--- a/arch/powerpc/include/asm/vdso/getrandom.h
+++ b/arch/powerpc/include/asm/vdso/getrandom.h
@@ -5,7 +5,7 @@
#ifndef _ASM_POWERPC_VDSO_GETRANDOM_H
#define _ASM_POWERPC_VDSO_GETRANDOM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/vdso_datapage.h>
@@ -61,6 +61,6 @@ static __always_inline struct vdso_rng_data *__arch_get_vdso_rng_data(void)
ssize_t __c_kernel_getrandom(void *buffer, size_t len, unsigned int flags, void *opaque_state,
size_t opaque_len);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_VDSO_GETRANDOM_H */
diff --git a/arch/powerpc/include/asm/vdso/gettimeofday.h b/arch/powerpc/include/asm/vdso/gettimeofday.h
index c6390890a60c2..7ab57669103ff 100644
--- a/arch/powerpc/include/asm/vdso/gettimeofday.h
+++ b/arch/powerpc/include/asm/vdso/gettimeofday.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_VDSO_GETTIMEOFDAY_H
#define _ASM_POWERPC_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/vdso/timebase.h>
#include <asm/barrier.h>
@@ -150,6 +150,6 @@ int __c_kernel_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz
const struct vdso_data *vd);
__kernel_old_time_t __c_kernel_time(__kernel_old_time_t *time,
const struct vdso_data *vd);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/powerpc/include/asm/vdso/processor.h b/arch/powerpc/include/asm/vdso/processor.h
index 80d13207c5688..c1f3d7aaf3ee9 100644
--- a/arch/powerpc/include/asm/vdso/processor.h
+++ b/arch/powerpc/include/asm/vdso/processor.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_VDSO_PROCESSOR_H
#define _ASM_POWERPC_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Macros for adjusting thread priority (hardware multi-threading) */
#ifdef CONFIG_PPC64
@@ -33,6 +33,6 @@
#define cpu_relax() barrier()
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_POWERPC_VDSO_PROCESSOR_H */
diff --git a/arch/powerpc/include/asm/vdso/vsyscall.h b/arch/powerpc/include/asm/vdso/vsyscall.h
index 48560a1195595..f1577b4f654d8 100644
--- a/arch/powerpc/include/asm/vdso/vsyscall.h
+++ b/arch/powerpc/include/asm/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_VDSO_VSYSCALL_H
#define _ASM_POWERPC_VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/vdso_datapage.h>
@@ -22,6 +22,6 @@ struct vdso_rng_data *__arch_get_k_vdso_rng_data(void)
/* The asm-generic header needs to be included after the definitions above */
#include <asm-generic/vdso/vsyscall.h>
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_POWERPC_VDSO_VSYSCALL_H */
diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index a202f5b634795..7275e8fcf242a 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -9,7 +9,7 @@
* IBM Corp.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/unistd.h>
#include <linux/time.h>
@@ -48,7 +48,7 @@ struct vdso_arch_data {
extern struct vdso_arch_data *vdso_data;
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
.macro get_datapage ptr offset=0
bcl 20, 31, .+4
@@ -61,7 +61,7 @@ extern struct vdso_arch_data *vdso_data;
#include <asm/asm-offsets.h>
#include <asm/page.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _SYSTEMCFG_H */
diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h
index 0b5c1993809eb..75471fb6fb101 100644
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
@@ -7,7 +7,7 @@
#include <asm/kvm_booke_hv_asm.h>
#include <asm/thread_info.h> /* for THREAD_SHIFT */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* Macros used for common Book-e exception handling
@@ -522,5 +522,5 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_EMB_HV)
bl kernel_fp_unavailable_exception; \
b interrupt_return
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __HEAD_BOOKE_H__ */
diff --git a/arch/powerpc/net/bpf_jit.h b/arch/powerpc/net/bpf_jit.h
index 6beacaec63d30..4ec6fdcb921f3 100644
--- a/arch/powerpc/net/bpf_jit.h
+++ b/arch/powerpc/net/bpf_jit.h
@@ -8,7 +8,7 @@
#ifndef _BPF_JIT_H
#define _BPF_JIT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <asm/ppc-opcode.h>
diff --git a/arch/powerpc/platforms/powernv/subcore.h b/arch/powerpc/platforms/powernv/subcore.h
index 77feee8436d48..413fd85d9bc28 100644
--- a/arch/powerpc/platforms/powernv/subcore.h
+++ b/arch/powerpc/platforms/powernv/subcore.h
@@ -9,7 +9,7 @@
#define SYNC_STEP_REAL_MODE 2 /* Set by secondary when in real mode */
#define SYNC_STEP_FINISHED 3 /* Set by secondary when split/unsplit is done */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_SMP
void split_core_secondary_loop(u8 *state);
@@ -18,4 +18,4 @@ extern void update_subcore_sibling_mask(void);
static inline void update_subcore_sibling_mask(void) { }
#endif /* CONFIG_SMP */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
diff --git a/arch/powerpc/xmon/xmon_bpts.h b/arch/powerpc/xmon/xmon_bpts.h
index 377068f52edb9..e14e4fb862e0c 100644
--- a/arch/powerpc/xmon/xmon_bpts.h
+++ b/arch/powerpc/xmon/xmon_bpts.h
@@ -3,12 +3,12 @@
#define XMON_BPTS_H
#define NBPTS 256
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/inst.h>
#define BPT_SIZE (sizeof(ppc_inst_t) * 2)
#define BPT_WORDS (BPT_SIZE / sizeof(ppc_inst_t))
extern unsigned int bpt_table[NBPTS * BPT_WORDS];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* XMON_BPTS_H */
diff --git a/tools/testing/selftests/powerpc/include/instructions.h b/tools/testing/selftests/powerpc/include/instructions.h
index 4efa6314bd963..864f0c9f1afcb 100644
--- a/tools/testing/selftests/powerpc/include/instructions.h
+++ b/tools/testing/selftests/powerpc/include/instructions.h
@@ -67,7 +67,7 @@ static inline int paste_last(void *i)
#define PPC_INST_PASTE_LAST __PASTE(0, 0, 1, 1)
/* This defines the prefixed load/store instructions */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define stringify_in_c(...) __VA_ARGS__
#else
# define __stringify_in_c(...) #__VA_ARGS__
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 28/41] riscv: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
@ 2025-03-14 7:09 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (39 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, linux-riscv
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: linux-riscv@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/riscv/include/uapi/asm/kvm.h | 2 +-
arch/riscv/include/uapi/asm/ptrace.h | 4 ++--
arch/riscv/include/uapi/asm/sigcontext.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h
index f06bc5efcd79a..1b460e8c6263b 100644
--- a/arch/riscv/include/uapi/asm/kvm.h
+++ b/arch/riscv/include/uapi/asm/kvm.h
@@ -9,7 +9,7 @@
#ifndef __LINUX_KVM_RISCV_H
#define __LINUX_KVM_RISCV_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/bitsperlong.h>
diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h
index a38268b19c3d3..beff8df80ac9c 100644
--- a/arch/riscv/include/uapi/asm/ptrace.h
+++ b/arch/riscv/include/uapi/asm/ptrace.h
@@ -6,7 +6,7 @@
#ifndef _UAPI_ASM_RISCV_PTRACE_H
#define _UAPI_ASM_RISCV_PTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -127,6 +127,6 @@ struct __riscv_v_regset_state {
*/
#define RISCV_MAX_VLENB (8192)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_RISCV_PTRACE_H */
diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h
index cd4f175dc8376..748dffc9ae194 100644
--- a/arch/riscv/include/uapi/asm/sigcontext.h
+++ b/arch/riscv/include/uapi/asm/sigcontext.h
@@ -15,7 +15,7 @@
/* The size of END signal context header. */
#define END_HDR_SIZE 0x0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct __sc_riscv_v_state {
struct __riscv_v_ext_state v_state;
@@ -35,6 +35,6 @@ struct sigcontext {
};
};
-#endif /*!__ASSEMBLY__*/
+#endif /*!__ASSEMBLER__*/
#endif /* _UAPI_ASM_RISCV_SIGCONTEXT_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 28/41] riscv: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
@ 2025-03-14 7:09 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:09 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, linux-riscv
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: linux-riscv@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/riscv/include/uapi/asm/kvm.h | 2 +-
arch/riscv/include/uapi/asm/ptrace.h | 4 ++--
arch/riscv/include/uapi/asm/sigcontext.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h
index f06bc5efcd79a..1b460e8c6263b 100644
--- a/arch/riscv/include/uapi/asm/kvm.h
+++ b/arch/riscv/include/uapi/asm/kvm.h
@@ -9,7 +9,7 @@
#ifndef __LINUX_KVM_RISCV_H
#define __LINUX_KVM_RISCV_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/bitsperlong.h>
diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h
index a38268b19c3d3..beff8df80ac9c 100644
--- a/arch/riscv/include/uapi/asm/ptrace.h
+++ b/arch/riscv/include/uapi/asm/ptrace.h
@@ -6,7 +6,7 @@
#ifndef _UAPI_ASM_RISCV_PTRACE_H
#define _UAPI_ASM_RISCV_PTRACE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -127,6 +127,6 @@ struct __riscv_v_regset_state {
*/
#define RISCV_MAX_VLENB (8192)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_RISCV_PTRACE_H */
diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h
index cd4f175dc8376..748dffc9ae194 100644
--- a/arch/riscv/include/uapi/asm/sigcontext.h
+++ b/arch/riscv/include/uapi/asm/sigcontext.h
@@ -15,7 +15,7 @@
/* The size of END signal context header. */
#define END_HDR_SIZE 0x0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct __sc_riscv_v_state {
struct __riscv_v_ext_state v_state;
@@ -35,6 +35,6 @@ struct sigcontext {
};
};
-#endif /*!__ASSEMBLY__*/
+#endif /*!__ASSEMBLER__*/
#endif /* _UAPI_ASM_RISCV_SIGCONTEXT_H */
--
2.48.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 94+ messages in thread
* [PATCH 29/41] riscv: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 7:09 ` [PATCH 02/41] include: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (39 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, linux-riscv
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: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: linux-riscv@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/riscv/include/asm/alternative-macros.h | 12 ++++++------
arch/riscv/include/asm/alternative.h | 2 +-
arch/riscv/include/asm/asm-extable.h | 6 +++---
arch/riscv/include/asm/asm.h | 10 +++++-----
arch/riscv/include/asm/assembler.h | 2 +-
arch/riscv/include/asm/barrier.h | 4 ++--
arch/riscv/include/asm/cache.h | 4 ++--
arch/riscv/include/asm/cpu_ops_sbi.h | 2 +-
arch/riscv/include/asm/csr.h | 4 ++--
arch/riscv/include/asm/current.h | 4 ++--
arch/riscv/include/asm/errata_list.h | 6 +++---
arch/riscv/include/asm/ftrace.h | 6 +++---
arch/riscv/include/asm/gpr-num.h | 6 +++---
arch/riscv/include/asm/image.h | 4 ++--
arch/riscv/include/asm/insn-def.h | 6 +++---
arch/riscv/include/asm/jump_label.h | 4 ++--
arch/riscv/include/asm/kasan.h | 2 +-
arch/riscv/include/asm/kgdb.h | 4 ++--
arch/riscv/include/asm/mmu.h | 4 ++--
arch/riscv/include/asm/page.h | 4 ++--
arch/riscv/include/asm/pgtable.h | 4 ++--
arch/riscv/include/asm/processor.h | 4 ++--
arch/riscv/include/asm/ptrace.h | 4 ++--
arch/riscv/include/asm/scs.h | 4 ++--
arch/riscv/include/asm/set_memory.h | 4 ++--
arch/riscv/include/asm/thread_info.h | 4 ++--
arch/riscv/include/asm/vdso.h | 4 ++--
arch/riscv/include/asm/vdso/gettimeofday.h | 4 ++--
arch/riscv/include/asm/vdso/processor.h | 4 ++--
arch/riscv/include/asm/vdso/vsyscall.h | 4 ++--
tools/arch/riscv/include/asm/csr.h | 6 +++---
tools/arch/riscv/include/asm/vdso/processor.h | 4 ++--
32 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h
index 721ec275ce57e..b63644f441dd0 100644
--- a/arch/riscv/include/asm/alternative-macros.h
+++ b/arch/riscv/include/asm/alternative-macros.h
@@ -4,7 +4,7 @@
#ifdef CONFIG_RISCV_ALTERNATIVE
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ALT_ENTRY oldptr newptr vendor_id patch_id new_len
.4byte \oldptr - .
@@ -53,7 +53,7 @@
#define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__
#define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <asm/asm.h>
#include <linux/stringify.h>
@@ -98,7 +98,7 @@
__ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1) \
ALT_NEW_CONTENT(vendor_id_2, patch_id_2, enable_2, new_c_2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, CONFIG_k) \
__ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, IS_ENABLED(CONFIG_k))
@@ -109,7 +109,7 @@
new_c_2, vendor_id_2, patch_id_2, IS_ENABLED(CONFIG_k_2))
#else /* CONFIG_RISCV_ALTERNATIVE */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ALTERNATIVE_CFG old_c
\old_c
@@ -121,7 +121,7 @@
#define _ALTERNATIVE_CFG_2(old_c, ...) \
ALTERNATIVE_CFG old_c
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define __ALTERNATIVE_CFG(old_c) \
old_c "\n"
@@ -132,7 +132,7 @@
#define _ALTERNATIVE_CFG_2(old_c, ...) \
__ALTERNATIVE_CFG(old_c)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_RISCV_ALTERNATIVE */
/*
diff --git a/arch/riscv/include/asm/alternative.h b/arch/riscv/include/asm/alternative.h
index 3c2b59b250179..0e95539ba451b 100644
--- a/arch/riscv/include/asm/alternative.h
+++ b/arch/riscv/include/asm/alternative.h
@@ -8,7 +8,7 @@
#include <asm/alternative-macros.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_RISCV_ALTERNATIVE
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
index 0c8bfd54fc4e0..37d425d7a7629 100644
--- a/arch/riscv/include/asm/asm-extable.h
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -10,7 +10,7 @@
#ifdef CONFIG_MMU
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
.pushsection __ex_table, "a"; \
@@ -25,7 +25,7 @@
__ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
.endm
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#include <linux/bits.h>
#include <linux/stringify.h>
@@ -77,7 +77,7 @@
EX_DATA_REG(ADDR, addr) \
")")
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* CONFIG_MMU */
#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err)
diff --git a/arch/riscv/include/asm/asm.h b/arch/riscv/include/asm/asm.h
index 776354895b81e..bd7b9632024ba 100644
--- a/arch/riscv/include/asm/asm.h
+++ b/arch/riscv/include/asm/asm.h
@@ -6,7 +6,7 @@
#ifndef _ASM_RISCV_ASM_H
#define _ASM_RISCV_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_STR(x) x
#else
#define __ASM_STR(x) #x
@@ -29,7 +29,7 @@
#define LGREG __REG_SEL(3, 2)
#if __SIZEOF_POINTER__ == 8
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define RISCV_PTR .dword
#define RISCV_SZPTR 8
#define RISCV_LGPTR 3
@@ -39,7 +39,7 @@
#define RISCV_LGPTR "3"
#endif
#elif __SIZEOF_POINTER__ == 4
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define RISCV_PTR .word
#define RISCV_SZPTR 4
#define RISCV_LGPTR 2
@@ -68,7 +68,7 @@
#error "Unexpected __SIZEOF_SHORT__"
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
/* Common assembly source macros */
@@ -193,6 +193,6 @@
#define ASM_NOKPROBE(name)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_ASM_H */
diff --git a/arch/riscv/include/asm/assembler.h b/arch/riscv/include/asm/assembler.h
index 44b1457d3e956..16931712beab6 100644
--- a/arch/riscv/include/asm/assembler.h
+++ b/arch/riscv/include/asm/assembler.h
@@ -5,7 +5,7 @@
* Author: Jee Heng Sia <jeeheng.sia@starfivetech.com>
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#error "Only include this from assembly code"
#endif
diff --git a/arch/riscv/include/asm/barrier.h b/arch/riscv/include/asm/barrier.h
index e1d9bf1deca68..8d2cc2df7f270 100644
--- a/arch/riscv/include/asm/barrier.h
+++ b/arch/riscv/include/asm/barrier.h
@@ -10,7 +10,7 @@
#ifndef _ASM_RISCV_BARRIER_H
#define _ASM_RISCV_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cmpxchg.h>
#include <asm/fence.h>
@@ -87,6 +87,6 @@ do { \
#include <asm-generic/barrier.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_BARRIER_H */
diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h
index 570e9d8acad1e..eb42b739d1328 100644
--- a/arch/riscv/include/asm/cache.h
+++ b/arch/riscv/include/asm/cache.h
@@ -24,7 +24,7 @@
#define ARCH_SLAB_MINALIGN 16
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int dma_cache_alignment;
#ifdef CONFIG_RISCV_DMA_NONCOHERENT
@@ -35,6 +35,6 @@ static inline int dma_get_cache_alignment(void)
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CACHE_H */
diff --git a/arch/riscv/include/asm/cpu_ops_sbi.h b/arch/riscv/include/asm/cpu_ops_sbi.h
index d6e4665b31954..776fa55fbaa45 100644
--- a/arch/riscv/include/asm/cpu_ops_sbi.h
+++ b/arch/riscv/include/asm/cpu_ops_sbi.h
@@ -5,7 +5,7 @@
#ifndef __ASM_CPU_OPS_SBI_H
#define __ASM_CPU_OPS_SBI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/threads.h>
diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h
index 6fed42e377059..4a37a98398ad3 100644
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@ -513,7 +513,7 @@
#define IE_TIE (_AC(0x1, UL) << RV_IRQ_TIMER)
#define IE_EIE (_AC(0x1, UL) << RV_IRQ_EXT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define csr_swap(csr, val) \
({ \
@@ -575,6 +575,6 @@
: "memory"); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CSR_H */
diff --git a/arch/riscv/include/asm/current.h b/arch/riscv/include/asm/current.h
index 21774d868c65b..ba5aa72aff631 100644
--- a/arch/riscv/include/asm/current.h
+++ b/arch/riscv/include/asm/current.h
@@ -13,7 +13,7 @@
#include <linux/bug.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
@@ -35,6 +35,6 @@ static __always_inline struct task_struct *get_current(void)
register unsigned long current_stack_pointer __asm__("sp");
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CURRENT_H */
diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h
index 6e426ed7919a4..e17d6c98b3bfd 100644
--- a/arch/riscv/include/asm/errata_list.h
+++ b/arch/riscv/include/asm/errata_list.h
@@ -29,7 +29,7 @@
#define ERRATA_THEAD_NUMBER 3
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ALT_INSN_FAULT(x) \
ALTERNATIVE(__stringify(RISCV_PTR do_trap_insn_fault), \
@@ -42,7 +42,7 @@ ALTERNATIVE(__stringify(RISCV_PTR do_page_fault), \
__stringify(RISCV_PTR sifive_cip_453_page_fault_trp), \
SIFIVE_VENDOR_ID, ERRATA_SIFIVE_CIP_453, \
CONFIG_ERRATA_SIFIVE_CIP_453)
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define ALT_SFENCE_VMA_ASID(asid) \
asm(ALTERNATIVE("sfence.vma x0, %0", "sfence.vma", SIFIVE_VENDOR_ID, \
@@ -123,6 +123,6 @@ asm volatile(ALTERNATIVE( \
#define THEAD_C9XX_RV_IRQ_PMU 17
#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h
index c4721ce44ca47..fc34692fbca5b 100644
--- a/arch/riscv/include/asm/ftrace.h
+++ b/arch/riscv/include/asm/ftrace.h
@@ -13,7 +13,7 @@
#endif
#define ARCH_SUPPORTS_FTRACE_OPS 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void *return_address(unsigned int level);
@@ -118,7 +118,7 @@ do { \
*/
#define MCOUNT_INSN_SIZE 8
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct dyn_ftrace;
int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec);
#define ftrace_init_nop ftrace_init_nop
@@ -228,7 +228,7 @@ static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, unsi
}
#endif /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_DYNAMIC_FTRACE */
diff --git a/arch/riscv/include/asm/gpr-num.h b/arch/riscv/include/asm/gpr-num.h
index efeb5edf8a3af..b499cf8327341 100644
--- a/arch/riscv/include/asm/gpr-num.h
+++ b/arch/riscv/include/asm/gpr-num.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GPR_NUM_H
#define __ASM_GPR_NUM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.irp num,0,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
.equ .L__gpr_num_x\num, \num
@@ -41,7 +41,7 @@
.equ .L__gpr_num_t5, 30
.equ .L__gpr_num_t6, 31
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define __DEFINE_ASM_GPR_NUMS \
" .irp num,0,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\n" \
@@ -80,6 +80,6 @@
" .equ .L__gpr_num_t5, 30\n" \
" .equ .L__gpr_num_t6, 31\n"
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GPR_NUM_H */
diff --git a/arch/riscv/include/asm/image.h b/arch/riscv/include/asm/image.h
index e0b319af3681a..68118538f38d2 100644
--- a/arch/riscv/include/asm/image.h
+++ b/arch/riscv/include/asm/image.h
@@ -29,7 +29,7 @@
#define RISCV_HEADER_VERSION (RISCV_HEADER_VERSION_MAJOR << 16 | \
RISCV_HEADER_VERSION_MINOR)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* struct riscv_image_header - riscv kernel image header
* @code0: Executable code
@@ -61,5 +61,5 @@ struct riscv_image_header {
u32 magic2;
u32 res3;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_IMAGE_H */
diff --git a/arch/riscv/include/asm/insn-def.h b/arch/riscv/include/asm/insn-def.h
index 9a913010cdd93..503bba7bdf080 100644
--- a/arch/riscv/include/asm/insn-def.h
+++ b/arch/riscv/include/asm/insn-def.h
@@ -18,7 +18,7 @@
#define INSN_I_RD_SHIFT 7
#define INSN_I_OPCODE_SHIFT 0
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_AS_HAS_INSN
@@ -56,7 +56,7 @@
#define __INSN_R(...) insn_r __VA_ARGS__
#define __INSN_I(...) insn_i __VA_ARGS__
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
#ifdef CONFIG_AS_HAS_INSN
@@ -110,7 +110,7 @@
#endif
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
#define INSN_R(opcode, func3, func7, rd, rs1, rs2) \
__INSN_R(RV_##opcode, RV_##func3, RV_##func7, \
diff --git a/arch/riscv/include/asm/jump_label.h b/arch/riscv/include/asm/jump_label.h
index 87a71cc6d146c..3ab5f2e3212be 100644
--- a/arch/riscv/include/asm/jump_label.h
+++ b/arch/riscv/include/asm/jump_label.h
@@ -7,7 +7,7 @@
#ifndef __ASM_JUMP_LABEL_H
#define __ASM_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/asm.h>
@@ -66,5 +66,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_JUMP_LABEL_H */
diff --git a/arch/riscv/include/asm/kasan.h b/arch/riscv/include/asm/kasan.h
index e6a0071bdb56c..60af6691f9032 100644
--- a/arch/riscv/include/asm/kasan.h
+++ b/arch/riscv/include/asm/kasan.h
@@ -4,7 +4,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The following comment was copied from arm64:
diff --git a/arch/riscv/include/asm/kgdb.h b/arch/riscv/include/asm/kgdb.h
index 46677daf708bd..c379cb91794b9 100644
--- a/arch/riscv/include/asm/kgdb.h
+++ b/arch/riscv/include/asm/kgdb.h
@@ -17,7 +17,7 @@
#define BREAK_INSTR_SIZE 4
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long kgdb_compiled_break;
@@ -29,7 +29,7 @@ static inline void arch_kgdb_breakpoint(void)
".option rvc\n");
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define DBG_REG_ZERO "zero"
#define DBG_REG_RA "ra"
diff --git a/arch/riscv/include/asm/mmu.h b/arch/riscv/include/asm/mmu.h
index 1cc90465d75b1..cf8e6eac77d52 100644
--- a/arch/riscv/include/asm/mmu.h
+++ b/arch/riscv/include/asm/mmu.h
@@ -7,7 +7,7 @@
#ifndef _ASM_RISCV_MMU_H
#define _ASM_RISCV_MMU_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
#ifndef CONFIG_MMU
@@ -40,6 +40,6 @@ typedef struct {
void __meminit create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t pa, phys_addr_t sz,
pgprot_t prot);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_MMU_H */
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
index 125f5ecd95652..ea6ff84c3d9fd 100644
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@ -40,7 +40,7 @@
#define PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
#endif /* CONFIG_64BIT */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_RISCV_ISA_ZICBOZ
void clear_page(void *page);
@@ -202,7 +202,7 @@ static __always_inline void *pfn_to_kaddr(unsigned long pfn)
return __va(pfn << PAGE_SHIFT);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define virt_addr_valid(vaddr) ({ \
unsigned long _addr = (unsigned long)vaddr; \
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 050fdc49b5ad7..f7b7849d810c1 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -107,7 +107,7 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/page.h>
#include <asm/tlbflush.h>
@@ -993,6 +993,6 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \
set_pgd(pgdp, pgd); \
})
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_RISCV_PGTABLE_H */
diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h
index 5f56eb9d114a9..4554b18b04a87 100644
--- a/arch/riscv/include/asm/processor.h
+++ b/arch/riscv/include/asm/processor.h
@@ -51,7 +51,7 @@
#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
struct task_struct;
@@ -186,6 +186,6 @@ long get_tagged_addr_ctrl(struct task_struct *task);
#define GET_TAGGED_ADDR_CTRL() get_tagged_addr_ctrl(current)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_PROCESSOR_H */
diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h
index b5b0adcc85c18..e26a79054c614 100644
--- a/arch/riscv/include/asm/ptrace.h
+++ b/arch/riscv/include/asm/ptrace.h
@@ -10,7 +10,7 @@
#include <asm/csr.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pt_regs {
unsigned long epc;
@@ -178,6 +178,6 @@ static inline int regs_irqs_disabled(struct pt_regs *regs)
return !(regs->status & SR_PIE);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_PTRACE_H */
diff --git a/arch/riscv/include/asm/scs.h b/arch/riscv/include/asm/scs.h
index 0e45db78b24bf..ab7714aa93bdc 100644
--- a/arch/riscv/include/asm/scs.h
+++ b/arch/riscv/include/asm/scs.h
@@ -2,7 +2,7 @@
#ifndef _ASM_SCS_H
#define _ASM_SCS_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#ifdef CONFIG_SHADOW_CALL_STACK
@@ -49,6 +49,6 @@
.endm
#endif /* CONFIG_SHADOW_CALL_STACK */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_SCS_H */
diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h
index ea263d3683ef6..87389e93325a3 100644
--- a/arch/riscv/include/asm/set_memory.h
+++ b/arch/riscv/include/asm/set_memory.h
@@ -6,7 +6,7 @@
#ifndef _ASM_RISCV_SET_MEMORY_H
#define _ASM_RISCV_SET_MEMORY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Functions to change memory attributes.
*/
@@ -45,7 +45,7 @@ int set_direct_map_default_noflush(struct page *page);
int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
bool kernel_page_present(struct page *page);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_XIP_KERNEL)
#ifdef CONFIG_64BIT
diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h
index f5916a70879a8..c33d8b7dd4880 100644
--- a/arch/riscv/include/asm/thread_info.h
+++ b/arch/riscv/include/asm/thread_info.h
@@ -37,7 +37,7 @@
#define IRQ_STACK_SIZE THREAD_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <asm/csr.h>
@@ -98,7 +98,7 @@ struct thread_info {
void arch_release_task_struct(struct task_struct *tsk);
int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* thread information flags
diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h
index f891478829a52..f1bd232b85dd3 100644
--- a/arch/riscv/include/asm/vdso.h
+++ b/arch/riscv/include/asm/vdso.h
@@ -16,7 +16,7 @@
#define __VVAR_PAGES 2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <generated/vdso-offsets.h>
#define VDSO_SYMBOL(base, name) \
@@ -34,7 +34,7 @@ extern char compat_vdso_start[], compat_vdso_end[];
extern char vdso_start[], vdso_end[];
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* CONFIG_MMU */
diff --git a/arch/riscv/include/asm/vdso/gettimeofday.h b/arch/riscv/include/asm/vdso/gettimeofday.h
index ba3283cf7acca..4ece833a6be1a 100644
--- a/arch/riscv/include/asm/vdso/gettimeofday.h
+++ b/arch/riscv/include/asm/vdso/gettimeofday.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <asm/unistd.h>
@@ -91,6 +91,6 @@ const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd)
return _timens_data;
}
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/riscv/include/asm/vdso/processor.h b/arch/riscv/include/asm/vdso/processor.h
index 8f383f05a290f..98fb44336c055 100644
--- a/arch/riscv/include/asm/vdso/processor.h
+++ b/arch/riscv/include/asm/vdso/processor.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <asm/insn-def.h>
@@ -23,6 +23,6 @@ static inline void cpu_relax(void)
barrier();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/riscv/include/asm/vdso/vsyscall.h b/arch/riscv/include/asm/vdso/vsyscall.h
index e8a9c4b53c0c9..6123b2efc484b 100644
--- a/arch/riscv/include/asm/vdso/vsyscall.h
+++ b/arch/riscv/include/asm/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
@@ -18,6 +18,6 @@ static __always_inline struct vdso_data *__riscv_get_k_vdso_data(void)
/* 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 */
diff --git a/tools/arch/riscv/include/asm/csr.h b/tools/arch/riscv/include/asm/csr.h
index 0dfc09254f99a..56d7367ee344c 100644
--- a/tools/arch/riscv/include/asm/csr.h
+++ b/tools/arch/riscv/include/asm/csr.h
@@ -468,13 +468,13 @@
#define IE_TIE (_AC(0x1, UL) << RV_IRQ_TIMER)
#define IE_EIE (_AC(0x1, UL) << RV_IRQ_EXT)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_STR(x) x
#else
#define __ASM_STR(x) #x
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define csr_swap(csr, val) \
({ \
@@ -536,6 +536,6 @@
: "memory"); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CSR_H */
diff --git a/tools/arch/riscv/include/asm/vdso/processor.h b/tools/arch/riscv/include/asm/vdso/processor.h
index 662aca0398481..0665b117f30f2 100644
--- a/tools/arch/riscv/include/asm/vdso/processor.h
+++ b/tools/arch/riscv/include/asm/vdso/processor.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/barrier.h>
@@ -27,6 +27,6 @@ static inline void cpu_relax(void)
barrier();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 29/41] riscv: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
@ 2025-03-14 7:10 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, linux-riscv
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: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: linux-riscv@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/riscv/include/asm/alternative-macros.h | 12 ++++++------
arch/riscv/include/asm/alternative.h | 2 +-
arch/riscv/include/asm/asm-extable.h | 6 +++---
arch/riscv/include/asm/asm.h | 10 +++++-----
arch/riscv/include/asm/assembler.h | 2 +-
arch/riscv/include/asm/barrier.h | 4 ++--
arch/riscv/include/asm/cache.h | 4 ++--
arch/riscv/include/asm/cpu_ops_sbi.h | 2 +-
arch/riscv/include/asm/csr.h | 4 ++--
arch/riscv/include/asm/current.h | 4 ++--
arch/riscv/include/asm/errata_list.h | 6 +++---
arch/riscv/include/asm/ftrace.h | 6 +++---
arch/riscv/include/asm/gpr-num.h | 6 +++---
arch/riscv/include/asm/image.h | 4 ++--
arch/riscv/include/asm/insn-def.h | 6 +++---
arch/riscv/include/asm/jump_label.h | 4 ++--
arch/riscv/include/asm/kasan.h | 2 +-
arch/riscv/include/asm/kgdb.h | 4 ++--
arch/riscv/include/asm/mmu.h | 4 ++--
arch/riscv/include/asm/page.h | 4 ++--
arch/riscv/include/asm/pgtable.h | 4 ++--
arch/riscv/include/asm/processor.h | 4 ++--
arch/riscv/include/asm/ptrace.h | 4 ++--
arch/riscv/include/asm/scs.h | 4 ++--
arch/riscv/include/asm/set_memory.h | 4 ++--
arch/riscv/include/asm/thread_info.h | 4 ++--
arch/riscv/include/asm/vdso.h | 4 ++--
arch/riscv/include/asm/vdso/gettimeofday.h | 4 ++--
arch/riscv/include/asm/vdso/processor.h | 4 ++--
arch/riscv/include/asm/vdso/vsyscall.h | 4 ++--
tools/arch/riscv/include/asm/csr.h | 6 +++---
tools/arch/riscv/include/asm/vdso/processor.h | 4 ++--
32 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h
index 721ec275ce57e..b63644f441dd0 100644
--- a/arch/riscv/include/asm/alternative-macros.h
+++ b/arch/riscv/include/asm/alternative-macros.h
@@ -4,7 +4,7 @@
#ifdef CONFIG_RISCV_ALTERNATIVE
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ALT_ENTRY oldptr newptr vendor_id patch_id new_len
.4byte \oldptr - .
@@ -53,7 +53,7 @@
#define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__
#define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <asm/asm.h>
#include <linux/stringify.h>
@@ -98,7 +98,7 @@
__ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, patch_id_1, enable_1) \
ALT_NEW_CONTENT(vendor_id_2, patch_id_2, enable_2, new_c_2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, CONFIG_k) \
__ALTERNATIVE_CFG(old_c, new_c, vendor_id, patch_id, IS_ENABLED(CONFIG_k))
@@ -109,7 +109,7 @@
new_c_2, vendor_id_2, patch_id_2, IS_ENABLED(CONFIG_k_2))
#else /* CONFIG_RISCV_ALTERNATIVE */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ALTERNATIVE_CFG old_c
\old_c
@@ -121,7 +121,7 @@
#define _ALTERNATIVE_CFG_2(old_c, ...) \
ALTERNATIVE_CFG old_c
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define __ALTERNATIVE_CFG(old_c) \
old_c "\n"
@@ -132,7 +132,7 @@
#define _ALTERNATIVE_CFG_2(old_c, ...) \
__ALTERNATIVE_CFG(old_c)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_RISCV_ALTERNATIVE */
/*
diff --git a/arch/riscv/include/asm/alternative.h b/arch/riscv/include/asm/alternative.h
index 3c2b59b250179..0e95539ba451b 100644
--- a/arch/riscv/include/asm/alternative.h
+++ b/arch/riscv/include/asm/alternative.h
@@ -8,7 +8,7 @@
#include <asm/alternative-macros.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_RISCV_ALTERNATIVE
diff --git a/arch/riscv/include/asm/asm-extable.h b/arch/riscv/include/asm/asm-extable.h
index 0c8bfd54fc4e0..37d425d7a7629 100644
--- a/arch/riscv/include/asm/asm-extable.h
+++ b/arch/riscv/include/asm/asm-extable.h
@@ -10,7 +10,7 @@
#ifdef CONFIG_MMU
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_EXTABLE_RAW(insn, fixup, type, data) \
.pushsection __ex_table, "a"; \
@@ -25,7 +25,7 @@
__ASM_EXTABLE_RAW(\insn, \fixup, EX_TYPE_FIXUP, 0)
.endm
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#include <linux/bits.h>
#include <linux/stringify.h>
@@ -77,7 +77,7 @@
EX_DATA_REG(ADDR, addr) \
")")
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* CONFIG_MMU */
#define _ASM_EXTABLE_UACCESS_ERR(insn, fixup, err)
diff --git a/arch/riscv/include/asm/asm.h b/arch/riscv/include/asm/asm.h
index 776354895b81e..bd7b9632024ba 100644
--- a/arch/riscv/include/asm/asm.h
+++ b/arch/riscv/include/asm/asm.h
@@ -6,7 +6,7 @@
#ifndef _ASM_RISCV_ASM_H
#define _ASM_RISCV_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_STR(x) x
#else
#define __ASM_STR(x) #x
@@ -29,7 +29,7 @@
#define LGREG __REG_SEL(3, 2)
#if __SIZEOF_POINTER__ == 8
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define RISCV_PTR .dword
#define RISCV_SZPTR 8
#define RISCV_LGPTR 3
@@ -39,7 +39,7 @@
#define RISCV_LGPTR "3"
#endif
#elif __SIZEOF_POINTER__ == 4
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define RISCV_PTR .word
#define RISCV_SZPTR 4
#define RISCV_LGPTR 2
@@ -68,7 +68,7 @@
#error "Unexpected __SIZEOF_SHORT__"
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
/* Common assembly source macros */
@@ -193,6 +193,6 @@
#define ASM_NOKPROBE(name)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_ASM_H */
diff --git a/arch/riscv/include/asm/assembler.h b/arch/riscv/include/asm/assembler.h
index 44b1457d3e956..16931712beab6 100644
--- a/arch/riscv/include/asm/assembler.h
+++ b/arch/riscv/include/asm/assembler.h
@@ -5,7 +5,7 @@
* Author: Jee Heng Sia <jeeheng.sia@starfivetech.com>
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#error "Only include this from assembly code"
#endif
diff --git a/arch/riscv/include/asm/barrier.h b/arch/riscv/include/asm/barrier.h
index e1d9bf1deca68..8d2cc2df7f270 100644
--- a/arch/riscv/include/asm/barrier.h
+++ b/arch/riscv/include/asm/barrier.h
@@ -10,7 +10,7 @@
#ifndef _ASM_RISCV_BARRIER_H
#define _ASM_RISCV_BARRIER_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cmpxchg.h>
#include <asm/fence.h>
@@ -87,6 +87,6 @@ do { \
#include <asm-generic/barrier.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_BARRIER_H */
diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h
index 570e9d8acad1e..eb42b739d1328 100644
--- a/arch/riscv/include/asm/cache.h
+++ b/arch/riscv/include/asm/cache.h
@@ -24,7 +24,7 @@
#define ARCH_SLAB_MINALIGN 16
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int dma_cache_alignment;
#ifdef CONFIG_RISCV_DMA_NONCOHERENT
@@ -35,6 +35,6 @@ static inline int dma_get_cache_alignment(void)
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CACHE_H */
diff --git a/arch/riscv/include/asm/cpu_ops_sbi.h b/arch/riscv/include/asm/cpu_ops_sbi.h
index d6e4665b31954..776fa55fbaa45 100644
--- a/arch/riscv/include/asm/cpu_ops_sbi.h
+++ b/arch/riscv/include/asm/cpu_ops_sbi.h
@@ -5,7 +5,7 @@
#ifndef __ASM_CPU_OPS_SBI_H
#define __ASM_CPU_OPS_SBI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/threads.h>
diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h
index 6fed42e377059..4a37a98398ad3 100644
--- a/arch/riscv/include/asm/csr.h
+++ b/arch/riscv/include/asm/csr.h
@@ -513,7 +513,7 @@
#define IE_TIE (_AC(0x1, UL) << RV_IRQ_TIMER)
#define IE_EIE (_AC(0x1, UL) << RV_IRQ_EXT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define csr_swap(csr, val) \
({ \
@@ -575,6 +575,6 @@
: "memory"); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CSR_H */
diff --git a/arch/riscv/include/asm/current.h b/arch/riscv/include/asm/current.h
index 21774d868c65b..ba5aa72aff631 100644
--- a/arch/riscv/include/asm/current.h
+++ b/arch/riscv/include/asm/current.h
@@ -13,7 +13,7 @@
#include <linux/bug.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
@@ -35,6 +35,6 @@ static __always_inline struct task_struct *get_current(void)
register unsigned long current_stack_pointer __asm__("sp");
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CURRENT_H */
diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h
index 6e426ed7919a4..e17d6c98b3bfd 100644
--- a/arch/riscv/include/asm/errata_list.h
+++ b/arch/riscv/include/asm/errata_list.h
@@ -29,7 +29,7 @@
#define ERRATA_THEAD_NUMBER 3
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ALT_INSN_FAULT(x) \
ALTERNATIVE(__stringify(RISCV_PTR do_trap_insn_fault), \
@@ -42,7 +42,7 @@ ALTERNATIVE(__stringify(RISCV_PTR do_page_fault), \
__stringify(RISCV_PTR sifive_cip_453_page_fault_trp), \
SIFIVE_VENDOR_ID, ERRATA_SIFIVE_CIP_453, \
CONFIG_ERRATA_SIFIVE_CIP_453)
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define ALT_SFENCE_VMA_ASID(asid) \
asm(ALTERNATIVE("sfence.vma x0, %0", "sfence.vma", SIFIVE_VENDOR_ID, \
@@ -123,6 +123,6 @@ asm volatile(ALTERNATIVE( \
#define THEAD_C9XX_RV_IRQ_PMU 17
#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h
index c4721ce44ca47..fc34692fbca5b 100644
--- a/arch/riscv/include/asm/ftrace.h
+++ b/arch/riscv/include/asm/ftrace.h
@@ -13,7 +13,7 @@
#endif
#define ARCH_SUPPORTS_FTRACE_OPS 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void *return_address(unsigned int level);
@@ -118,7 +118,7 @@ do { \
*/
#define MCOUNT_INSN_SIZE 8
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct dyn_ftrace;
int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec);
#define ftrace_init_nop ftrace_init_nop
@@ -228,7 +228,7 @@ static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, unsi
}
#endif /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_DYNAMIC_FTRACE */
diff --git a/arch/riscv/include/asm/gpr-num.h b/arch/riscv/include/asm/gpr-num.h
index efeb5edf8a3af..b499cf8327341 100644
--- a/arch/riscv/include/asm/gpr-num.h
+++ b/arch/riscv/include/asm/gpr-num.h
@@ -2,7 +2,7 @@
#ifndef __ASM_GPR_NUM_H
#define __ASM_GPR_NUM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.irp num,0,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
.equ .L__gpr_num_x\num, \num
@@ -41,7 +41,7 @@
.equ .L__gpr_num_t5, 30
.equ .L__gpr_num_t6, 31
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define __DEFINE_ASM_GPR_NUMS \
" .irp num,0,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\n" \
@@ -80,6 +80,6 @@
" .equ .L__gpr_num_t5, 30\n" \
" .equ .L__gpr_num_t6, 31\n"
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_GPR_NUM_H */
diff --git a/arch/riscv/include/asm/image.h b/arch/riscv/include/asm/image.h
index e0b319af3681a..68118538f38d2 100644
--- a/arch/riscv/include/asm/image.h
+++ b/arch/riscv/include/asm/image.h
@@ -29,7 +29,7 @@
#define RISCV_HEADER_VERSION (RISCV_HEADER_VERSION_MAJOR << 16 | \
RISCV_HEADER_VERSION_MINOR)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/**
* struct riscv_image_header - riscv kernel image header
* @code0: Executable code
@@ -61,5 +61,5 @@ struct riscv_image_header {
u32 magic2;
u32 res3;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_IMAGE_H */
diff --git a/arch/riscv/include/asm/insn-def.h b/arch/riscv/include/asm/insn-def.h
index 9a913010cdd93..503bba7bdf080 100644
--- a/arch/riscv/include/asm/insn-def.h
+++ b/arch/riscv/include/asm/insn-def.h
@@ -18,7 +18,7 @@
#define INSN_I_RD_SHIFT 7
#define INSN_I_OPCODE_SHIFT 0
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_AS_HAS_INSN
@@ -56,7 +56,7 @@
#define __INSN_R(...) insn_r __VA_ARGS__
#define __INSN_I(...) insn_i __VA_ARGS__
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
#ifdef CONFIG_AS_HAS_INSN
@@ -110,7 +110,7 @@
#endif
-#endif /* ! __ASSEMBLY__ */
+#endif /* ! __ASSEMBLER__ */
#define INSN_R(opcode, func3, func7, rd, rs1, rs2) \
__INSN_R(RV_##opcode, RV_##func3, RV_##func7, \
diff --git a/arch/riscv/include/asm/jump_label.h b/arch/riscv/include/asm/jump_label.h
index 87a71cc6d146c..3ab5f2e3212be 100644
--- a/arch/riscv/include/asm/jump_label.h
+++ b/arch/riscv/include/asm/jump_label.h
@@ -7,7 +7,7 @@
#ifndef __ASM_JUMP_LABEL_H
#define __ASM_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/asm.h>
@@ -66,5 +66,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_JUMP_LABEL_H */
diff --git a/arch/riscv/include/asm/kasan.h b/arch/riscv/include/asm/kasan.h
index e6a0071bdb56c..60af6691f9032 100644
--- a/arch/riscv/include/asm/kasan.h
+++ b/arch/riscv/include/asm/kasan.h
@@ -4,7 +4,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The following comment was copied from arm64:
diff --git a/arch/riscv/include/asm/kgdb.h b/arch/riscv/include/asm/kgdb.h
index 46677daf708bd..c379cb91794b9 100644
--- a/arch/riscv/include/asm/kgdb.h
+++ b/arch/riscv/include/asm/kgdb.h
@@ -17,7 +17,7 @@
#define BREAK_INSTR_SIZE 4
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long kgdb_compiled_break;
@@ -29,7 +29,7 @@ static inline void arch_kgdb_breakpoint(void)
".option rvc\n");
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define DBG_REG_ZERO "zero"
#define DBG_REG_RA "ra"
diff --git a/arch/riscv/include/asm/mmu.h b/arch/riscv/include/asm/mmu.h
index 1cc90465d75b1..cf8e6eac77d52 100644
--- a/arch/riscv/include/asm/mmu.h
+++ b/arch/riscv/include/asm/mmu.h
@@ -7,7 +7,7 @@
#ifndef _ASM_RISCV_MMU_H
#define _ASM_RISCV_MMU_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
#ifndef CONFIG_MMU
@@ -40,6 +40,6 @@ typedef struct {
void __meminit create_pgd_mapping(pgd_t *pgdp, uintptr_t va, phys_addr_t pa, phys_addr_t sz,
pgprot_t prot);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_MMU_H */
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h
index 125f5ecd95652..ea6ff84c3d9fd 100644
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
@@ -40,7 +40,7 @@
#define PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
#endif /* CONFIG_64BIT */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_RISCV_ISA_ZICBOZ
void clear_page(void *page);
@@ -202,7 +202,7 @@ static __always_inline void *pfn_to_kaddr(unsigned long pfn)
return __va(pfn << PAGE_SHIFT);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define virt_addr_valid(vaddr) ({ \
unsigned long _addr = (unsigned long)vaddr; \
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index 050fdc49b5ad7..f7b7849d810c1 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -107,7 +107,7 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/page.h>
#include <asm/tlbflush.h>
@@ -993,6 +993,6 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \
set_pgd(pgdp, pgd); \
})
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_RISCV_PGTABLE_H */
diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h
index 5f56eb9d114a9..4554b18b04a87 100644
--- a/arch/riscv/include/asm/processor.h
+++ b/arch/riscv/include/asm/processor.h
@@ -51,7 +51,7 @@
#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
struct task_struct;
@@ -186,6 +186,6 @@ long get_tagged_addr_ctrl(struct task_struct *task);
#define GET_TAGGED_ADDR_CTRL() get_tagged_addr_ctrl(current)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_PROCESSOR_H */
diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h
index b5b0adcc85c18..e26a79054c614 100644
--- a/arch/riscv/include/asm/ptrace.h
+++ b/arch/riscv/include/asm/ptrace.h
@@ -10,7 +10,7 @@
#include <asm/csr.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pt_regs {
unsigned long epc;
@@ -178,6 +178,6 @@ static inline int regs_irqs_disabled(struct pt_regs *regs)
return !(regs->status & SR_PIE);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_PTRACE_H */
diff --git a/arch/riscv/include/asm/scs.h b/arch/riscv/include/asm/scs.h
index 0e45db78b24bf..ab7714aa93bdc 100644
--- a/arch/riscv/include/asm/scs.h
+++ b/arch/riscv/include/asm/scs.h
@@ -2,7 +2,7 @@
#ifndef _ASM_SCS_H
#define _ASM_SCS_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/asm-offsets.h>
#ifdef CONFIG_SHADOW_CALL_STACK
@@ -49,6 +49,6 @@
.endm
#endif /* CONFIG_SHADOW_CALL_STACK */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_SCS_H */
diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h
index ea263d3683ef6..87389e93325a3 100644
--- a/arch/riscv/include/asm/set_memory.h
+++ b/arch/riscv/include/asm/set_memory.h
@@ -6,7 +6,7 @@
#ifndef _ASM_RISCV_SET_MEMORY_H
#define _ASM_RISCV_SET_MEMORY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Functions to change memory attributes.
*/
@@ -45,7 +45,7 @@ int set_direct_map_default_noflush(struct page *page);
int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
bool kernel_page_present(struct page *page);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_XIP_KERNEL)
#ifdef CONFIG_64BIT
diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h
index f5916a70879a8..c33d8b7dd4880 100644
--- a/arch/riscv/include/asm/thread_info.h
+++ b/arch/riscv/include/asm/thread_info.h
@@ -37,7 +37,7 @@
#define IRQ_STACK_SIZE THREAD_SIZE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <asm/csr.h>
@@ -98,7 +98,7 @@ struct thread_info {
void arch_release_task_struct(struct task_struct *tsk);
int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* thread information flags
diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h
index f891478829a52..f1bd232b85dd3 100644
--- a/arch/riscv/include/asm/vdso.h
+++ b/arch/riscv/include/asm/vdso.h
@@ -16,7 +16,7 @@
#define __VVAR_PAGES 2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <generated/vdso-offsets.h>
#define VDSO_SYMBOL(base, name) \
@@ -34,7 +34,7 @@ extern char compat_vdso_start[], compat_vdso_end[];
extern char vdso_start[], vdso_end[];
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* CONFIG_MMU */
diff --git a/arch/riscv/include/asm/vdso/gettimeofday.h b/arch/riscv/include/asm/vdso/gettimeofday.h
index ba3283cf7acca..4ece833a6be1a 100644
--- a/arch/riscv/include/asm/vdso/gettimeofday.h
+++ b/arch/riscv/include/asm/vdso/gettimeofday.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <asm/unistd.h>
@@ -91,6 +91,6 @@ const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd)
return _timens_data;
}
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/riscv/include/asm/vdso/processor.h b/arch/riscv/include/asm/vdso/processor.h
index 8f383f05a290f..98fb44336c055 100644
--- a/arch/riscv/include/asm/vdso/processor.h
+++ b/arch/riscv/include/asm/vdso/processor.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/barrier.h>
#include <asm/insn-def.h>
@@ -23,6 +23,6 @@ static inline void cpu_relax(void)
barrier();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/riscv/include/asm/vdso/vsyscall.h b/arch/riscv/include/asm/vdso/vsyscall.h
index e8a9c4b53c0c9..6123b2efc484b 100644
--- a/arch/riscv/include/asm/vdso/vsyscall.h
+++ b/arch/riscv/include/asm/vdso/vsyscall.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_VSYSCALL_H
#define __ASM_VDSO_VSYSCALL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
@@ -18,6 +18,6 @@ static __always_inline struct vdso_data *__riscv_get_k_vdso_data(void)
/* 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 */
diff --git a/tools/arch/riscv/include/asm/csr.h b/tools/arch/riscv/include/asm/csr.h
index 0dfc09254f99a..56d7367ee344c 100644
--- a/tools/arch/riscv/include/asm/csr.h
+++ b/tools/arch/riscv/include/asm/csr.h
@@ -468,13 +468,13 @@
#define IE_TIE (_AC(0x1, UL) << RV_IRQ_TIMER)
#define IE_EIE (_AC(0x1, UL) << RV_IRQ_EXT)
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __ASM_STR(x) x
#else
#define __ASM_STR(x) #x
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define csr_swap(csr, val) \
({ \
@@ -536,6 +536,6 @@
: "memory"); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_RISCV_CSR_H */
diff --git a/tools/arch/riscv/include/asm/vdso/processor.h b/tools/arch/riscv/include/asm/vdso/processor.h
index 662aca0398481..0665b117f30f2 100644
--- a/tools/arch/riscv/include/asm/vdso/processor.h
+++ b/tools/arch/riscv/include/asm/vdso/processor.h
@@ -2,7 +2,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/barrier.h>
@@ -27,6 +27,6 @@ static inline void cpu_relax(void)
barrier();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
--
2.48.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 94+ messages in thread
* [PATCH 30/41] s390/uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (28 preceding siblings ...)
2025-03-14 7:10 ` Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 7:10 ` [PATCH 31/41] s390x: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (10 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, linux-s390
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/s390/include/uapi/asm/ptrace.h | 5 +++--
arch/s390/include/uapi/asm/schid.h | 4 ++--
arch/s390/include/uapi/asm/types.h | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/s390/include/uapi/asm/ptrace.h b/arch/s390/include/uapi/asm/ptrace.h
index bb0826024bb95..ea202072f1ad5 100644
--- a/arch/s390/include/uapi/asm/ptrace.h
+++ b/arch/s390/include/uapi/asm/ptrace.h
@@ -242,7 +242,8 @@
#define PTRACE_OLDSETOPTIONS 21
#define PTRACE_SYSEMU 31
#define PTRACE_SYSEMU_SINGLESTEP 32
-#ifndef __ASSEMBLY__
+
+#ifndef __ASSEMBLER__
#include <linux/stddef.h>
#include <linux/types.h>
@@ -450,6 +451,6 @@ struct user_regs_struct {
unsigned long ieee_instruction_pointer; /* obsolete, always 0 */
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_S390_PTRACE_H */
diff --git a/arch/s390/include/uapi/asm/schid.h b/arch/s390/include/uapi/asm/schid.h
index a3e1cf1685534..d804d1a5b1b3f 100644
--- a/arch/s390/include/uapi/asm/schid.h
+++ b/arch/s390/include/uapi/asm/schid.h
@@ -4,7 +4,7 @@
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct subchannel_id {
__u32 cssid : 8;
@@ -15,6 +15,6 @@ struct subchannel_id {
__u32 sch_no : 16;
} __attribute__ ((packed, aligned(4)));
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPIASM_SCHID_H */
diff --git a/arch/s390/include/uapi/asm/types.h b/arch/s390/include/uapi/asm/types.h
index 84457dbb26b4a..4ab468c5032e3 100644
--- a/arch/s390/include/uapi/asm/types.h
+++ b/arch/s390/include/uapi/asm/types.h
@@ -10,7 +10,7 @@
#include <asm-generic/int-ll64.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef unsigned long addr_t;
typedef __signed__ long saddr_t;
@@ -25,6 +25,6 @@ typedef struct {
};
} __attribute__((packed, aligned(4))) __vector128;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_S390_TYPES_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 31/41] s390x: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (29 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 30/41] s390/uapi: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 7:10 ` [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers Thomas Huth
` (9 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Heiko Carstens,
Vasily Gorbik, Alexander Gordeev, Christian Borntraeger,
Sven Schnelle, linux-s390
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: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/s390/boot/boot.h | 4 ++--
arch/s390/include/asm/alternative.h | 6 +++---
arch/s390/include/asm/asm-const.h | 2 +-
arch/s390/include/asm/cpu.h | 4 ++--
arch/s390/include/asm/cpu_mf-insn.h | 4 ++--
arch/s390/include/asm/ctlreg.h | 4 ++--
arch/s390/include/asm/dwarf.h | 4 ++--
arch/s390/include/asm/extmem.h | 2 +-
arch/s390/include/asm/fpu-insn-asm.h | 4 ++--
arch/s390/include/asm/fpu-insn.h | 4 ++--
arch/s390/include/asm/ftrace.h | 4 ++--
arch/s390/include/asm/irq.h | 4 ++--
arch/s390/include/asm/jump_label.h | 4 ++--
arch/s390/include/asm/lowcore.h | 6 +++---
arch/s390/include/asm/mem_encrypt.h | 4 ++--
arch/s390/include/asm/nmi.h | 4 ++--
arch/s390/include/asm/nospec-branch.h | 4 ++--
arch/s390/include/asm/nospec-insn.h | 4 ++--
arch/s390/include/asm/page.h | 4 ++--
arch/s390/include/asm/processor.h | 4 ++--
arch/s390/include/asm/ptrace.h | 4 ++--
arch/s390/include/asm/purgatory.h | 4 ++--
arch/s390/include/asm/sclp.h | 4 ++--
arch/s390/include/asm/setup.h | 4 ++--
arch/s390/include/asm/sigp.h | 4 ++--
arch/s390/include/asm/thread_info.h | 2 +-
arch/s390/include/asm/tpi.h | 4 ++--
arch/s390/include/asm/types.h | 4 ++--
arch/s390/include/asm/vdso.h | 4 ++--
arch/s390/include/asm/vdso/getrandom.h | 4 ++--
arch/s390/include/asm/vdso/vsyscall.h | 4 ++--
arch/s390/net/bpf_jit.h | 4 ++--
32 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/arch/s390/boot/boot.h b/arch/s390/boot/boot.h
index 69f261566a64a..de399f7d4af2c 100644
--- a/arch/s390/boot/boot.h
+++ b/arch/s390/boot/boot.h
@@ -6,7 +6,7 @@
#define IPL_START 0x200
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/printk.h>
#include <asm/physmem_info.h>
@@ -125,5 +125,5 @@ static inline bool intersects(unsigned long addr0, unsigned long size0,
{
return addr0 + size0 > addr1 && addr1 + size1 > addr0;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* BOOT_BOOT_H */
diff --git a/arch/s390/include/asm/alternative.h b/arch/s390/include/asm/alternative.h
index 73e781b56bfe8..a05e91092e816 100644
--- a/arch/s390/include/asm/alternative.h
+++ b/arch/s390/include/asm/alternative.h
@@ -50,7 +50,7 @@
#define ALT_LOWCORE (ALT_CTX_EARLY << ALT_CTX_SHIFT | \
ALT_TYPE_LOWCORE << ALT_TYPE_SHIFT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/stddef.h>
@@ -182,7 +182,7 @@ static inline void apply_alternatives(struct alt_instr *start, struct alt_instr
/* Use this macro if clobbers are needed without inputs. */
#define ASM_NO_INPUT_CLOBBER(clobber...) : clobber
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/*
* Issue one struct alt_instr descriptor entry (need to put it into
@@ -232,6 +232,6 @@ static inline void apply_alternatives(struct alt_instr *start, struct alt_instr
.popsection
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_ALTERNATIVE_H */
diff --git a/arch/s390/include/asm/asm-const.h b/arch/s390/include/asm/asm-const.h
index 11f615eb00663..1cfffad9eea0b 100644
--- a/arch/s390/include/asm/asm-const.h
+++ b/arch/s390/include/asm/asm-const.h
@@ -2,7 +2,7 @@
#ifndef _ASM_S390_ASM_CONST_H
#define _ASM_S390_ASM_CONST_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define stringify_in_c(...) __VA_ARGS__
#else
/* This version of stringify will deal with commas... */
diff --git a/arch/s390/include/asm/cpu.h b/arch/s390/include/asm/cpu.h
index 26c710cd34859..5672e3fab52b2 100644
--- a/arch/s390/include/asm/cpu.h
+++ b/arch/s390/include/asm/cpu.h
@@ -9,7 +9,7 @@
#ifndef _ASM_S390_CPU_H
#define _ASM_S390_CPU_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/jump_label.h>
@@ -24,5 +24,5 @@ struct cpuid
DECLARE_STATIC_KEY_FALSE(cpu_has_bear);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_CPU_H */
diff --git a/arch/s390/include/asm/cpu_mf-insn.h b/arch/s390/include/asm/cpu_mf-insn.h
index a68b362e09647..941663939cc70 100644
--- a/arch/s390/include/asm/cpu_mf-insn.h
+++ b/arch/s390/include/asm/cpu_mf-insn.h
@@ -8,7 +8,7 @@
#ifndef _ASM_S390_CPU_MF_INSN_H
#define _ASM_S390_CPU_MF_INSN_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* Macro to generate the STCCTM instruction with a customized
* M3 field designating the counter set.
@@ -17,6 +17,6 @@
.insn rsy,0xeb0000000017,\r1,\m3 & 0xf,\db2
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/s390/include/asm/ctlreg.h b/arch/s390/include/asm/ctlreg.h
index e6527f51ad0b5..e93cc240a1ed4 100644
--- a/arch/s390/include/asm/ctlreg.h
+++ b/arch/s390/include/asm/ctlreg.h
@@ -80,7 +80,7 @@
#define CR14_EXTERNAL_DAMAGE_SUBMASK BIT(CR14_EXTERNAL_DAMAGE_SUBMASK_BIT)
#define CR14_WARNING_SUBMASK BIT(CR14_WARNING_SUBMASK_BIT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
@@ -252,5 +252,5 @@ union ctlreg15 {
};
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_S390_CTLREG_H */
diff --git a/arch/s390/include/asm/dwarf.h b/arch/s390/include/asm/dwarf.h
index 390906b8e386e..e3ad6798d0cd0 100644
--- a/arch/s390/include/asm/dwarf.h
+++ b/arch/s390/include/asm/dwarf.h
@@ -2,7 +2,7 @@
#ifndef _ASM_S390_DWARF_H
#define _ASM_S390_DWARF_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define CFI_STARTPROC .cfi_startproc
#define CFI_ENDPROC .cfi_endproc
@@ -33,6 +33,6 @@
.cfi_sections .eh_frame, .debug_frame
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_DWARF_H */
diff --git a/arch/s390/include/asm/extmem.h b/arch/s390/include/asm/extmem.h
index e0a06060afddc..225ee89c3f5e0 100644
--- a/arch/s390/include/asm/extmem.h
+++ b/arch/s390/include/asm/extmem.h
@@ -6,7 +6,7 @@
#ifndef _ASM_S390X_DCSS_H
#define _ASM_S390X_DCSS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* DCSS segment is defined as a contiguous range of pages using DEFSEG command.
diff --git a/arch/s390/include/asm/fpu-insn-asm.h b/arch/s390/include/asm/fpu-insn-asm.h
index d296322be4bcc..cc0468fdf2d07 100644
--- a/arch/s390/include/asm/fpu-insn-asm.h
+++ b/arch/s390/include/asm/fpu-insn-asm.h
@@ -16,7 +16,7 @@
#error only <asm/fpu-insn.h> can be included directly
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* Macros to generate vector instruction byte code */
@@ -750,5 +750,5 @@
MRXBOPC 0, 0x77, v1, v2, v3
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_S390_FPU_INSN_ASM_H */
diff --git a/arch/s390/include/asm/fpu-insn.h b/arch/s390/include/asm/fpu-insn.h
index f668bffd6dd3d..135bb89c0a893 100644
--- a/arch/s390/include/asm/fpu-insn.h
+++ b/arch/s390/include/asm/fpu-insn.h
@@ -9,7 +9,7 @@
#include <asm/fpu-insn-asm.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/instrumented.h>
#include <asm/asm-extable.h>
@@ -475,5 +475,5 @@ static __always_inline void fpu_vzero(u8 v)
: "memory");
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_S390_FPU_INSN_H */
diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
index 185331e91f83c..bee2d16c29517 100644
--- a/arch/s390/include/asm/ftrace.h
+++ b/arch/s390/include/asm/ftrace.h
@@ -5,7 +5,7 @@
#define ARCH_SUPPORTS_FTRACE_OPS 1
#define MCOUNT_INSN_SIZE 6
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/stacktrace.h>
static __always_inline unsigned long return_address(unsigned int n)
@@ -134,7 +134,7 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
struct ftrace_ops *op, struct ftrace_regs *fregs);
#define ftrace_graph_func ftrace_graph_func
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_FUNCTION_TRACER
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index d9e705f4a697e..d9ac6a839db3d 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -25,7 +25,7 @@
#define EXT_IRQ_CP_SERVICE 0x2603
#define EXT_IRQ_IUCV 0x4000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/hardirq.h>
#include <linux/percpu.h>
@@ -121,6 +121,6 @@ void irq_subclass_unregister(enum irq_subclass subclass);
#define irq_canonicalize(irq) (irq)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_IRQ_H */
diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h
index bf78cf381dfcd..d9cbc18f6b2ee 100644
--- a/arch/s390/include/asm/jump_label.h
+++ b/arch/s390/include/asm/jump_label.h
@@ -4,7 +4,7 @@
#define HAVE_JUMP_LABEL_BATCH
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/stringify.h>
@@ -51,5 +51,5 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
return true;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 42a092fa10297..8db0d18913e30 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -21,7 +21,7 @@
#define LOWCORE_ALT_ADDRESS _AC(0x70000, UL)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pgm_tdb {
u64 data[32];
@@ -235,7 +235,7 @@ static inline void set_prefix(__u32 address)
asm volatile("spx %0" : : "Q" (address) : "memory");
}
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
.macro GET_LC reg
ALTERNATIVE "llilh \reg,0", \
@@ -249,5 +249,5 @@ static inline void set_prefix(__u32 address)
ALT_LOWCORE
.endm
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_LOWCORE_H */
diff --git a/arch/s390/include/asm/mem_encrypt.h b/arch/s390/include/asm/mem_encrypt.h
index b85e13505a0f2..28c83ec1f2430 100644
--- a/arch/s390/include/asm/mem_encrypt.h
+++ b/arch/s390/include/asm/mem_encrypt.h
@@ -2,11 +2,11 @@
#ifndef S390_MEM_ENCRYPT_H__
#define S390_MEM_ENCRYPT_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
int set_memory_encrypted(unsigned long vaddr, int numpages);
int set_memory_decrypted(unsigned long vaddr, int numpages);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* S390_MEM_ENCRYPT_H__ */
diff --git a/arch/s390/include/asm/nmi.h b/arch/s390/include/asm/nmi.h
index 227466ce9e416..6454c15318544 100644
--- a/arch/s390/include/asm/nmi.h
+++ b/arch/s390/include/asm/nmi.h
@@ -33,7 +33,7 @@
#define MCCK_CODE_FC_VALID BIT(63 - 43)
#define MCCK_CODE_CPU_TIMER_VALID BIT(63 - 46)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
union mci {
unsigned long val;
@@ -104,5 +104,5 @@ void nmi_free_mcesa(u64 *mcesad);
void s390_handle_mcck(void);
void s390_do_machine_check(struct pt_regs *regs);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_NMI_H */
diff --git a/arch/s390/include/asm/nospec-branch.h b/arch/s390/include/asm/nospec-branch.h
index 192835a3e24dc..47356531d2800 100644
--- a/arch/s390/include/asm/nospec-branch.h
+++ b/arch/s390/include/asm/nospec-branch.h
@@ -2,7 +2,7 @@
#ifndef _ASM_S390_EXPOLINE_H
#define _ASM_S390_EXPOLINE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/facility.h>
@@ -46,6 +46,6 @@ void __s390_indirect_jump_r15(void);
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_EXPOLINE_H */
diff --git a/arch/s390/include/asm/nospec-insn.h b/arch/s390/include/asm/nospec-insn.h
index cb15dd25bf219..75c083d02567f 100644
--- a/arch/s390/include/asm/nospec-insn.h
+++ b/arch/s390/include/asm/nospec-insn.h
@@ -5,7 +5,7 @@
#include <linux/linkage.h>
#include <asm/dwarf.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CC_USING_EXPOLINE
@@ -128,6 +128,6 @@
.endm
#endif /* CC_USING_EXPOLINE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_NOSPEC_ASM_H */
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 1ff145f7b52b1..739ed1a8405fe 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -33,7 +33,7 @@
#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
#include <asm/setup.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void __storage_key_init_range(unsigned long start, unsigned long end);
@@ -267,7 +267,7 @@ static inline unsigned long virt_to_pfn(const void *kaddr)
#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#include <asm-generic/memory_model.h>
#include <asm-generic/getorder.h>
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 4f8d5592c2981..3a0befc129024 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -26,7 +26,7 @@
#define RESTART_FLAG_CTLREGS _AC(1 << 0, U)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
#include <linux/linkage.h>
@@ -419,6 +419,6 @@ static __always_inline void bpon(void)
asm volatile(ALTERNATIVE("nop", ".insn rrf,0xb2e80000,0,0,13,0", ALT_SPEC(82)));
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_S390_PROCESSOR_H */
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 788bc4467445c..25da883e2255f 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -55,7 +55,7 @@
PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_MCHECK | \
PSW_MASK_PSTATE | PSW_ASC_PRIMARY)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct psw_bits {
unsigned long : 1;
@@ -263,5 +263,5 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc)
regs->gprs[2] = rc;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _S390_PTRACE_H */
diff --git a/arch/s390/include/asm/purgatory.h b/arch/s390/include/asm/purgatory.h
index e297bcfc476f6..4c7a43bc43a19 100644
--- a/arch/s390/include/asm/purgatory.h
+++ b/arch/s390/include/asm/purgatory.h
@@ -7,11 +7,11 @@
#ifndef _S390_PURGATORY_H_
#define _S390_PURGATORY_H_
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/purgatory.h>
int verify_sha256_digest(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _S390_PURGATORY_H_ */
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index 18f37dff03c99..d472913e6bb0f 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -21,7 +21,7 @@
#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2
#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/uio.h>
#include <asm/chpid.h>
#include <asm/cpu.h>
@@ -198,5 +198,5 @@ static inline int sclp_get_core_info(struct sclp_core_info *info, int early)
return _sclp_get_core_info(info);
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_SCLP_H */
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 70b920b32827e..f8a6eba279dbf 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -46,7 +46,7 @@
#define LEGACY_COMMAND_LINE_SIZE 896
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/lowcore.h>
#include <asm/types.h>
@@ -142,5 +142,5 @@ static __always_inline u32 gen_lpswe(unsigned long addr)
BUILD_BUG_ON(addr > 0xfff);
return 0xb2b20000 | addr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_SETUP_H */
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h
index 472943b770662..97d77868f83ce 100644
--- a/arch/s390/include/asm/sigp.h
+++ b/arch/s390/include/asm/sigp.h
@@ -36,7 +36,7 @@
#define SIGP_STATUS_INCORRECT_STATE 0x00000200UL
#define SIGP_STATUS_NOT_RUNNING 0x00000400UL
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/asm.h>
@@ -68,6 +68,6 @@ static inline int __pcpu_sigp(u16 addr, u8 order, unsigned long parm,
return cc;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __S390_ASM_SIGP_H */
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index c33f7144d1b97..6cd0465745d86 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -26,7 +26,7 @@
#define STACK_INIT_OFFSET (THREAD_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/lowcore.h>
#include <asm/page.h>
diff --git a/arch/s390/include/asm/tpi.h b/arch/s390/include/asm/tpi.h
index f76e5fdff23a2..71c8b6f76cdd2 100644
--- a/arch/s390/include/asm/tpi.h
+++ b/arch/s390/include/asm/tpi.h
@@ -5,7 +5,7 @@
#include <linux/types.h>
#include <uapi/asm/schid.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* I/O-Interruption Code as stored by TEST PENDING INTERRUPTION (TPI). */
struct tpi_info {
@@ -32,6 +32,6 @@ struct tpi_adapter_info {
u32 :27;
} __packed __aligned(4);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_TPI_H */
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h
index 0b5d550a0478b..53695b2196f78 100644
--- a/arch/s390/include/asm/types.h
+++ b/arch/s390/include/asm/types.h
@@ -5,7 +5,7 @@
#include <uapi/asm/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
union register_pair {
unsigned __int128 pair;
@@ -15,5 +15,5 @@ union register_pair {
};
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_S390_TYPES_H */
diff --git a/arch/s390/include/asm/vdso.h b/arch/s390/include/asm/vdso.h
index 92c73e4d97a93..5913c3a38192e 100644
--- a/arch/s390/include/asm/vdso.h
+++ b/arch/s390/include/asm/vdso.h
@@ -4,13 +4,13 @@
#include <vdso/datapage.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern struct vdso_data *vdso_data;
int vdso_getcpu_init(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define __VVAR_PAGES 2
diff --git a/arch/s390/include/asm/vdso/getrandom.h b/arch/s390/include/asm/vdso/getrandom.h
index 36355af7160be..d9a59221aa87a 100644
--- a/arch/s390/include/asm/vdso/getrandom.h
+++ b/arch/s390/include/asm/vdso/getrandom.h
@@ -3,7 +3,7 @@
#ifndef __ASM_VDSO_GETRANDOM_H
#define __ASM_VDSO_GETRANDOM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
#include <asm/vdso/vsyscall.h>
@@ -35,6 +35,6 @@ static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void
return &_vdso_rng_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETRANDOM_H */
diff --git a/arch/s390/include/asm/vdso/vsyscall.h b/arch/s390/include/asm/vdso/vsyscall.h
index 3eb576ecd3bd9..2b58681e6011f 100644
--- a/arch/s390/include/asm/vdso/vsyscall.h
+++ b/arch/s390/include/asm/vdso/vsyscall.h
@@ -4,7 +4,7 @@
#define __VDSO_RND_DATA_OFFSET 768
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/hrtimer.h>
#include <vdso/datapage.h>
@@ -31,6 +31,6 @@ static __always_inline struct vdso_rng_data *__s390_get_k_vdso_rnd_data(void)
/* 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 */
diff --git a/arch/s390/net/bpf_jit.h b/arch/s390/net/bpf_jit.h
index 7822ea92e54af..615e6da713745 100644
--- a/arch/s390/net/bpf_jit.h
+++ b/arch/s390/net/bpf_jit.h
@@ -11,12 +11,12 @@
#ifndef __ARCH_S390_NET_BPF_JIT_H
#define __ARCH_S390_NET_BPF_JIT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/filter.h>
#include <linux/types.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Stackframe layout (packed stack):
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (30 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 31/41] s390x: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-06-06 7:18 ` Thomas Huth
2025-06-07 13:11 ` John Paul Adrian Glaubitz
2025-03-14 7:10 ` [PATCH 33/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (8 subsequent siblings)
40 siblings, 2 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Yoshinori Sato,
Rich Felker, John Paul Adrian Glaubitz, linux-sh
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__ */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers
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
2025-06-06 7:37 ` John Paul Adrian Glaubitz
2025-06-07 13:11 ` John Paul Adrian Glaubitz
1 sibling, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-06 7:18 UTC (permalink / raw)
To: Yoshinori Sato, Rich Felker, John Paul Adrian Glaubitz; +Cc: linux-sh
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
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers
2025-06-06 7:18 ` Thomas Huth
@ 2025-06-06 7:37 ` John Paul Adrian Glaubitz
0 siblings, 0 replies; 94+ messages in thread
From: John Paul Adrian Glaubitz @ 2025-06-06 7:37 UTC (permalink / raw)
To: Thomas Huth, Yoshinori Sato, Rich Felker; +Cc: linux-sh
Hi Thomas,
On Fri, 2025-06-06 at 09:18 +0200, Thomas Huth wrote:
> 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).
Yes, I'll review and pick it up this weekend.
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers
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
@ 2025-06-07 13:11 ` John Paul Adrian Glaubitz
1 sibling, 0 replies; 94+ messages in thread
From: John Paul Adrian Glaubitz @ 2025-06-07 13:11 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, Yoshinori Sato, Rich Felker, linux-sh
Hi Thomas,
On Fri, 2025-03-14 at 08:10 +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).
>
> 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__ */
I agree with this. Changes look good to me.
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 33/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (31 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 32/41] sh: Replace __ASSEMBLY__ with __ASSEMBLER__ in the SuperH headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-09-26 15:03 ` Andreas Larsson
2025-03-14 7:10 ` [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (7 subsequent siblings)
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, David S. Miller,
Andreas Larsson, sparclinux
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/sparc/include/uapi/asm/ptrace.h | 24 ++++++++++++------------
arch/sparc/include/uapi/asm/signal.h | 4 ++--
arch/sparc/include/uapi/asm/traps.h | 4 ++--
arch/sparc/include/uapi/asm/utrap.h | 4 ++--
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/sparc/include/uapi/asm/ptrace.h b/arch/sparc/include/uapi/asm/ptrace.h
index abe640037a55d..2eb677f4eb6ab 100644
--- a/arch/sparc/include/uapi/asm/ptrace.h
+++ b/arch/sparc/include/uapi/asm/ptrace.h
@@ -15,7 +15,7 @@
*/
#define PT_REGS_MAGIC 0x57ac6c00
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -88,7 +88,7 @@ struct sparc_trapf {
unsigned long _unused;
struct pt_regs *regs;
};
-#endif /* (!__ASSEMBLY__) */
+#endif /* (!__ASSEMBLER__) */
#else
/* 32 bit sparc */
@@ -97,7 +97,7 @@ struct sparc_trapf {
/* This struct defines the way the registers are stored on the
* stack during a system call and basically all traps.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -125,11 +125,11 @@ struct sparc_stackf {
unsigned long xargs[6];
unsigned long xxargs[1];
};
-#endif /* (!__ASSEMBLY__) */
+#endif /* (!__ASSEMBLER__) */
#endif /* (defined(__sparc__) && defined(__arch64__))*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define TRACEREG_SZ sizeof(struct pt_regs)
#define STACKFRAME_SZ sizeof(struct sparc_stackf)
@@ -137,7 +137,7 @@ struct sparc_stackf {
#define TRACEREG32_SZ sizeof(struct pt_regs32)
#define STACKFRAME32_SZ sizeof(struct sparc_stackf32)
-#endif /* (!__ASSEMBLY__) */
+#endif /* (!__ASSEMBLER__) */
#define UREG_G0 0
#define UREG_G1 1
@@ -161,30 +161,30 @@ struct sparc_stackf {
#if defined(__sparc__) && defined(__arch64__)
/* 64 bit sparc */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
/* For assembly code. */
#define TRACEREG_SZ 0xa0
#define STACKFRAME_SZ 0xc0
#define TRACEREG32_SZ 0x50
#define STACKFRAME32_SZ 0x60
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* (defined(__sparc__) && defined(__arch64__)) */
/* 32 bit sparc */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
-#else /* (!__ASSEMBLY__) */
+#else /* (!__ASSEMBLER__) */
/* For assembly code. */
#define TRACEREG_SZ 0x50
#define STACKFRAME_SZ 0x60
-#endif /* (!__ASSEMBLY__) */
+#endif /* (!__ASSEMBLER__) */
#endif /* (defined(__sparc__) && defined(__arch64__)) */
diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h
index b613829247250..9c64d7cb85c2a 100644
--- a/arch/sparc/include/uapi/asm/signal.h
+++ b/arch/sparc/include/uapi/asm/signal.h
@@ -105,7 +105,7 @@
#define __old_sigaction32 sigaction32
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef unsigned long __old_sigset_t; /* at least 32 bits */
@@ -176,6 +176,6 @@ typedef struct sigaltstack {
} stack_t;
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* _UAPI__SPARC_SIGNAL_H */
diff --git a/arch/sparc/include/uapi/asm/traps.h b/arch/sparc/include/uapi/asm/traps.h
index 930db746f8bd7..43fe5b8fe8be1 100644
--- a/arch/sparc/include/uapi/asm/traps.h
+++ b/arch/sparc/include/uapi/asm/traps.h
@@ -10,8 +10,8 @@
#define NUM_SPARC_TRAPS 255
-#ifndef __ASSEMBLY__
-#endif /* !(__ASSEMBLY__) */
+#ifndef __ASSEMBLER__
+#endif /* !(__ASSEMBLER__) */
/* For patching the trap table at boot time, we need to know how to
* form various common Sparc instructions. Thus these macros...
diff --git a/arch/sparc/include/uapi/asm/utrap.h b/arch/sparc/include/uapi/asm/utrap.h
index d890b7fc6e835..a489b08b6a33d 100644
--- a/arch/sparc/include/uapi/asm/utrap.h
+++ b/arch/sparc/include/uapi/asm/utrap.h
@@ -44,9 +44,9 @@
#define UTH_NOCHANGE (-1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef int utrap_entry_t;
typedef void *utrap_handler_t;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* !(__ASM_SPARC64_PROCESSOR_H) */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 33/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:10 ` [PATCH 33/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-09-26 15:03 ` Andreas Larsson
0 siblings, 0 replies; 94+ messages in thread
From: Andreas Larsson @ 2025-09-26 15:03 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, David S. Miller, sparclinux
On 2025-03-14 08:10, Thomas Huth wrote:
> __ASSEMBLY__ is only defined by the Makefile of the kernel, so
> this is not really useful for uapi headers (unless the userspace
> Makefile defines it, too). Let's switch to __ASSEMBLER__ which
> gets set automatically by the compiler when compiling assembly
> code.
>
> This is a completely mechanical patch (done with a simple "sed -i"
> statement).
>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Andreas Larsson <andreas@gaisler.com>
> Cc: sparclinux@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/sparc/include/uapi/asm/ptrace.h | 24 ++++++++++++------------
> arch/sparc/include/uapi/asm/signal.h | 4 ++--
> arch/sparc/include/uapi/asm/traps.h | 4 ++--
> arch/sparc/include/uapi/asm/utrap.h | 4 ++--
> 4 files changed, 18 insertions(+), 18 deletions(-)
Reviewed-by: Andreas Larsson <andreas@gaisler.com>
Picking this up to my for-next.
Thanks,
Andreas
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (32 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 33/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-06-06 7:22 ` Thomas Huth
` (2 more replies)
2025-03-14 7:10 ` [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers Thomas Huth
` (6 subsequent siblings)
40 siblings, 3 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, David S. Miller,
Andreas Larsson, sparclinux
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: "David S. Miller" <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/sparc/include/asm/adi_64.h | 4 +-
arch/sparc/include/asm/auxio.h | 4 +-
arch/sparc/include/asm/auxio_32.h | 4 +-
arch/sparc/include/asm/auxio_64.h | 4 +-
arch/sparc/include/asm/cacheflush_64.h | 4 +-
arch/sparc/include/asm/cpudata.h | 4 +-
arch/sparc/include/asm/cpudata_64.h | 4 +-
arch/sparc/include/asm/delay_64.h | 4 +-
arch/sparc/include/asm/ftrace.h | 2 +-
arch/sparc/include/asm/hvtramp.h | 2 +-
arch/sparc/include/asm/hypervisor.h | 92 ++++++++++++-------------
arch/sparc/include/asm/irqflags_32.h | 4 +-
arch/sparc/include/asm/irqflags_64.h | 4 +-
arch/sparc/include/asm/jump_label.h | 4 +-
arch/sparc/include/asm/kdebug_32.h | 4 +-
arch/sparc/include/asm/leon.h | 8 +--
arch/sparc/include/asm/leon_amba.h | 6 +-
arch/sparc/include/asm/mman.h | 4 +-
arch/sparc/include/asm/mmu_64.h | 4 +-
arch/sparc/include/asm/mmu_context_32.h | 4 +-
arch/sparc/include/asm/mmu_context_64.h | 4 +-
arch/sparc/include/asm/mxcc.h | 4 +-
arch/sparc/include/asm/obio.h | 4 +-
arch/sparc/include/asm/openprom.h | 4 +-
arch/sparc/include/asm/page_32.h | 8 +--
arch/sparc/include/asm/page_64.h | 8 +--
arch/sparc/include/asm/pcic.h | 2 +-
arch/sparc/include/asm/pgtable_32.h | 4 +-
arch/sparc/include/asm/pgtable_64.h | 8 +--
arch/sparc/include/asm/pgtsrmmu.h | 6 +-
arch/sparc/include/asm/processor_64.h | 10 +--
arch/sparc/include/asm/psr.h | 4 +-
arch/sparc/include/asm/ptrace.h | 12 ++--
arch/sparc/include/asm/ross.h | 4 +-
arch/sparc/include/asm/sbi.h | 4 +-
arch/sparc/include/asm/sigcontext.h | 4 +-
arch/sparc/include/asm/signal.h | 6 +-
arch/sparc/include/asm/smp_32.h | 8 +--
arch/sparc/include/asm/smp_64.h | 8 +--
arch/sparc/include/asm/spinlock_32.h | 4 +-
arch/sparc/include/asm/spinlock_64.h | 4 +-
arch/sparc/include/asm/spitfire.h | 4 +-
arch/sparc/include/asm/starfire.h | 2 +-
arch/sparc/include/asm/thread_info_32.h | 4 +-
arch/sparc/include/asm/thread_info_64.h | 12 ++--
arch/sparc/include/asm/trap_block.h | 4 +-
arch/sparc/include/asm/traps.h | 4 +-
arch/sparc/include/asm/tsb.h | 2 +-
arch/sparc/include/asm/ttable.h | 2 +-
arch/sparc/include/asm/turbosparc.h | 4 +-
arch/sparc/include/asm/upa.h | 4 +-
arch/sparc/include/asm/vaddrs.h | 2 +-
arch/sparc/include/asm/viking.h | 4 +-
arch/sparc/include/asm/visasm.h | 2 +-
drivers/char/hw_random/n2rng.h | 4 +-
55 files changed, 172 insertions(+), 172 deletions(-)
diff --git a/arch/sparc/include/asm/adi_64.h b/arch/sparc/include/asm/adi_64.h
index 4301c6fd87f7a..0c066fdab6963 100644
--- a/arch/sparc/include/asm/adi_64.h
+++ b/arch/sparc/include/asm/adi_64.h
@@ -9,7 +9,7 @@
#include <linux/types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct adi_caps {
__u64 blksz;
@@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void)
return adi_state.caps.nbits;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* !(__ASM_SPARC64_ADI_H) */
diff --git a/arch/sparc/include/asm/auxio.h b/arch/sparc/include/asm/auxio.h
index a2681052e9000..d0a933ed0d04b 100644
--- a/arch/sparc/include/asm/auxio.h
+++ b/arch/sparc/include/asm/auxio.h
@@ -2,11 +2,11 @@
#ifndef ___ASM_SPARC_AUXIO_H
#define ___ASM_SPARC_AUXIO_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __iomem *auxio_register;
-#endif /* ifndef __ASSEMBLY__ */
+#endif /* ifndef __ASSEMBLER__ */
#if defined(__sparc__) && defined(__arch64__)
#include <asm/auxio_64.h>
diff --git a/arch/sparc/include/asm/auxio_32.h b/arch/sparc/include/asm/auxio_32.h
index 852457c7a265a..db58fa28de9ec 100644
--- a/arch/sparc/include/asm/auxio_32.h
+++ b/arch/sparc/include/asm/auxio_32.h
@@ -29,7 +29,7 @@
#define AUXIO_FLPY_EJCT 0x02 /* Eject floppy disk. Write only. */
#define AUXIO_LED 0x01 /* On if set, off if unset. Read/Write */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* NOTE: these routines are implementation dependent--
@@ -75,7 +75,7 @@ do { \
} \
} while (0)
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/* AUXIO2 (Power Off Control) */
diff --git a/arch/sparc/include/asm/auxio_64.h b/arch/sparc/include/asm/auxio_64.h
index ae1ed41987db7..8a4ae07daf168 100644
--- a/arch/sparc/include/asm/auxio_64.h
+++ b/arch/sparc/include/asm/auxio_64.h
@@ -74,7 +74,7 @@
#define AUXIO_PCIO_CPWR_OFF 0x02 /* Courtesy Power Off */
#define AUXIO_PCIO_SPWR_OFF 0x01 /* System Power Off */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define AUXIO_LTE_ON 1
#define AUXIO_LTE_OFF 0
@@ -94,6 +94,6 @@ void auxio_set_lte(int on);
*/
void auxio_set_led(int on);
-#endif /* ifndef __ASSEMBLY__ */
+#endif /* ifndef __ASSEMBLER__ */
#endif /* !(_SPARC64_AUXIO_H) */
diff --git a/arch/sparc/include/asm/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h
index 2b1261b77ecd1..06092572c0455 100644
--- a/arch/sparc/include/asm/cacheflush_64.h
+++ b/arch/sparc/include/asm/cacheflush_64.h
@@ -4,7 +4,7 @@
#include <asm/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mm.h>
@@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *,
#define flush_cache_vmap_early(start, end) do { } while (0)
#define flush_cache_vunmap(start, end) do { } while (0)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _SPARC64_CACHEFLUSH_H */
diff --git a/arch/sparc/include/asm/cpudata.h b/arch/sparc/include/asm/cpudata.h
index d213165ee713b..67022a153023f 100644
--- a/arch/sparc/include/asm/cpudata.h
+++ b/arch/sparc/include/asm/cpudata.h
@@ -2,14 +2,14 @@
#ifndef ___ASM_SPARC_CPUDATA_H
#define ___ASM_SPARC_CPUDATA_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/threads.h>
#include <linux/percpu.h>
extern const struct seq_operations cpuinfo_op;
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#if defined(__sparc__) && defined(__arch64__)
#include <asm/cpudata_64.h>
diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
index 9c3fc03abe9ae..056b3c0e7ef94 100644
--- a/arch/sparc/include/asm/cpudata_64.h
+++ b/arch/sparc/include/asm/cpudata_64.h
@@ -7,7 +7,7 @@
#ifndef _SPARC64_CPUDATA_H
#define _SPARC64_CPUDATA_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
typedef struct {
/* Dcache line 1 */
@@ -35,7 +35,7 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
#define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
#define local_cpu_data() (*this_cpu_ptr(&__cpu_data))
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#include <asm/trap_block.h>
diff --git a/arch/sparc/include/asm/delay_64.h b/arch/sparc/include/asm/delay_64.h
index 22213b1c119d2..5de5b5f23188c 100644
--- a/arch/sparc/include/asm/delay_64.h
+++ b/arch/sparc/include/asm/delay_64.h
@@ -7,12 +7,12 @@
#ifndef _SPARC64_DELAY_H
#define _SPARC64_DELAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void __delay(unsigned long loops);
void udelay(unsigned long usecs);
#define mdelay(n) udelay((n) * 1000)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _SPARC64_DELAY_H */
diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/ftrace.h
index e284394cb3aa2..f7c9036199c5e 100644
--- a/arch/sparc/include/asm/ftrace.h
+++ b/arch/sparc/include/asm/ftrace.h
@@ -6,7 +6,7 @@
#define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void _mcount(void);
#endif
diff --git a/arch/sparc/include/asm/hvtramp.h b/arch/sparc/include/asm/hvtramp.h
index ce2453ea4f2be..8cf7a54fa528a 100644
--- a/arch/sparc/include/asm/hvtramp.h
+++ b/arch/sparc/include/asm/hvtramp.h
@@ -2,7 +2,7 @@
#ifndef _SPARC64_HVTRAP_H
#define _SPARC64_HVTRAP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index f220edcf17c7c..94ac56d43746b 100644
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
@@ -102,7 +102,7 @@
*/
#define HV_FAST_MACH_EXIT 0x00
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void sun4v_mach_exit(unsigned long exit_code);
#endif
@@ -131,7 +131,7 @@ void sun4v_mach_exit(unsigned long exit_code);
*/
#define HV_FAST_MACH_DESC 0x01
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_mach_desc(unsigned long buffer_pa,
unsigned long buf_len,
unsigned long *real_buf_len);
@@ -152,7 +152,7 @@ unsigned long sun4v_mach_desc(unsigned long buffer_pa,
*/
#define HV_FAST_MACH_SIR 0x02
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void sun4v_mach_sir(void);
#endif
@@ -208,7 +208,7 @@ void sun4v_mach_sir(void);
*/
#define HV_FAST_MACH_SET_WATCHDOG 0x05
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
unsigned long *orig_timeout);
#endif
@@ -254,7 +254,7 @@ unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
*/
#define HV_FAST_CPU_START 0x10
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_cpu_start(unsigned long cpuid,
unsigned long pc,
unsigned long rtba,
@@ -282,7 +282,7 @@ unsigned long sun4v_cpu_start(unsigned long cpuid,
*/
#define HV_FAST_CPU_STOP 0x11
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_cpu_stop(unsigned long cpuid);
#endif
@@ -299,7 +299,7 @@ unsigned long sun4v_cpu_stop(unsigned long cpuid);
*/
#define HV_FAST_CPU_YIELD 0x12
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_cpu_yield(void);
#endif
@@ -317,7 +317,7 @@ unsigned long sun4v_cpu_yield(void);
*/
#define HV_FAST_CPU_POKE 0x13
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_cpu_poke(unsigned long cpuid);
#endif
@@ -363,7 +363,7 @@ unsigned long sun4v_cpu_poke(unsigned long cpuid);
#define HV_CPU_QUEUE_RES_ERROR 0x3e
#define HV_CPU_QUEUE_NONRES_ERROR 0x3f
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_cpu_qconf(unsigned long type,
unsigned long queue_paddr,
unsigned long num_queue_entries);
@@ -416,7 +416,7 @@ unsigned long sun4v_cpu_qconf(unsigned long type,
*/
#define HV_FAST_CPU_MONDO_SEND 0x42
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
unsigned long cpu_list_pa,
unsigned long mondo_block_pa);
@@ -449,7 +449,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
#define HV_CPU_STATE_RUNNING 0x02
#define HV_CPU_STATE_ERROR 0x03
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
long sun4v_cpu_state(unsigned long cpuid);
#endif
@@ -485,7 +485,7 @@ long sun4v_cpu_state(unsigned long cpuid);
*
* Layout of a TSB description for mmu_tsb_ctx{,non}0() calls.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct hv_tsb_descr {
unsigned short pgsz_idx;
unsigned short assoc;
@@ -536,7 +536,7 @@ struct hv_tsb_descr {
* The fault status block is a multiple of 64-bytes and must be aligned
* on a 64-byte boundary.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct hv_fault_status {
unsigned long i_fault_type;
unsigned long i_fault_addr;
@@ -651,7 +651,7 @@ struct hv_fault_status {
*/
#define HV_FAST_MMU_TSB_CTX0 0x20
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
unsigned long tsb_desc_ra);
#endif
@@ -736,7 +736,7 @@ unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
*/
#define HV_FAST_MMU_DEMAP_ALL 0x24
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void sun4v_mmu_demap_all(void);
#endif
@@ -766,7 +766,7 @@ void sun4v_mmu_demap_all(void);
*/
#define HV_FAST_MMU_MAP_PERM_ADDR 0x25
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
unsigned long set_to_zero,
unsigned long tte,
@@ -990,7 +990,7 @@ unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
*/
#define HV_CCB_SUBMIT 0x34
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
unsigned long len,
unsigned long flags,
@@ -1035,7 +1035,7 @@ unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
*/
#define HV_CCB_INFO 0x35
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_ccb_info(unsigned long ca,
void *info_arr);
#endif
@@ -1069,7 +1069,7 @@ unsigned long sun4v_ccb_info(unsigned long ca,
*/
#define HV_CCB_KILL 0x36
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_ccb_kill(unsigned long ca,
void *kill_status);
#endif
@@ -1104,7 +1104,7 @@ unsigned long sun4v_ccb_kill(unsigned long ca,
*/
#define HV_FAST_TOD_GET 0x50
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_tod_get(unsigned long *time);
#endif
@@ -1121,7 +1121,7 @@ unsigned long sun4v_tod_get(unsigned long *time);
*/
#define HV_FAST_TOD_SET 0x51
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_tod_set(unsigned long time);
#endif
@@ -1197,7 +1197,7 @@ unsigned long sun4v_tod_set(unsigned long time);
*/
#define HV_FAST_CONS_WRITE 0x63
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
long sun4v_con_getchar(long *status);
long sun4v_con_putchar(long c);
long sun4v_con_read(unsigned long buffer,
@@ -1239,7 +1239,7 @@ unsigned long sun4v_con_write(unsigned long buffer,
#define HV_SOFT_STATE_NORMAL 0x01
#define HV_SOFT_STATE_TRANSITION 0x02
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
unsigned long msg_string_ra);
#endif
@@ -1318,7 +1318,7 @@ unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
*/
#define HV_FAST_SVC_CLRSTATUS 0x84
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_svc_send(unsigned long svc_id,
unsigned long buffer,
unsigned long buffer_size,
@@ -1348,7 +1348,7 @@ unsigned long sun4v_svc_clrstatus(unsigned long svc_id,
* start (offset 0) of the trap trace buffer, and is described as
* follows:
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct hv_trap_trace_control {
unsigned long head_offset;
unsigned long tail_offset;
@@ -1367,7 +1367,7 @@ struct hv_trap_trace_control {
*
* Each trap trace buffer entry is laid out as follows:
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct hv_trap_trace_entry {
unsigned char type; /* Hypervisor or guest entry? */
unsigned char hpstate; /* Hyper-privileged state */
@@ -1617,7 +1617,7 @@ struct hv_trap_trace_entry {
*/
#define HV_FAST_INTR_DEVINO2SYSINO 0xa0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
unsigned long devino);
#endif
@@ -1635,7 +1635,7 @@ unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
*/
#define HV_FAST_INTR_GETENABLED 0xa1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_intr_getenabled(unsigned long sysino);
#endif
@@ -1651,7 +1651,7 @@ unsigned long sun4v_intr_getenabled(unsigned long sysino);
*/
#define HV_FAST_INTR_SETENABLED 0xa2
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_intr_setenabled(unsigned long sysino,
unsigned long intr_enabled);
#endif
@@ -1668,7 +1668,7 @@ unsigned long sun4v_intr_setenabled(unsigned long sysino,
*/
#define HV_FAST_INTR_GETSTATE 0xa3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_intr_getstate(unsigned long sysino);
#endif
@@ -1688,7 +1688,7 @@ unsigned long sun4v_intr_getstate(unsigned long sysino);
*/
#define HV_FAST_INTR_SETSTATE 0xa4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state);
#endif
@@ -1706,7 +1706,7 @@ unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state
*/
#define HV_FAST_INTR_GETTARGET 0xa5
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_intr_gettarget(unsigned long sysino);
#endif
@@ -1723,7 +1723,7 @@ unsigned long sun4v_intr_gettarget(unsigned long sysino);
*/
#define HV_FAST_INTR_SETTARGET 0xa6
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
#endif
@@ -1807,7 +1807,7 @@ unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
*/
#define HV_FAST_VINTR_SET_TARGET 0xae
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_vintr_get_cookie(unsigned long dev_handle,
unsigned long dev_ino,
unsigned long *cookie);
@@ -3047,7 +3047,7 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
#define LDC_MTE_SZ64K 0x0000000000000001 /* 64K page */
#define LDC_MTE_SZ8K 0x0000000000000000 /* 8K page */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct ldc_mtable_entry {
unsigned long mte;
unsigned long cookie;
@@ -3130,7 +3130,7 @@ struct ldc_mtable_entry {
*/
#define HV_FAST_LDC_REVOKE 0xef
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_ldc_tx_qconf(unsigned long channel,
unsigned long ra,
unsigned long num_entries);
@@ -3230,7 +3230,7 @@ unsigned long sun4v_ldc_revoke(unsigned long channel,
#define HV_FAST_N2_GET_PERFREG 0x104
#define HV_FAST_N2_SET_PERFREG 0x105
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_niagara_getperf(unsigned long reg,
unsigned long *val);
unsigned long sun4v_niagara_setperf(unsigned long reg,
@@ -3247,7 +3247,7 @@ unsigned long sun4v_niagara2_setperf(unsigned long reg,
* a buffer where these statistics can be collected. It is continually
* updated once configured. The layout is as follows:
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct hv_mmu_statistics {
unsigned long immu_tsb_hits_ctx0_8k_tte;
unsigned long immu_tsb_ticks_ctx0_8k_tte;
@@ -3332,7 +3332,7 @@ struct hv_mmu_statistics {
*/
#define HV_FAST_MMUSTAT_INFO 0x103
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_mmustat_conf(unsigned long ra, unsigned long *orig_ra);
unsigned long sun4v_mmustat_info(unsigned long *ra);
#endif
@@ -3343,7 +3343,7 @@ unsigned long sun4v_mmustat_info(unsigned long *ra);
#define HV_NCS_QCONF 0x01
#define HV_NCS_QTAIL_UPDATE 0x02
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct hv_ncs_queue_entry {
/* MAU Control Register */
unsigned long mau_control;
@@ -3422,7 +3422,7 @@ struct hv_ncs_qtail_update_arg {
*/
#define HV_FAST_NCS_REQUEST 0x110
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_ncs_request(unsigned long request,
unsigned long arg_ra,
unsigned long arg_size);
@@ -3433,7 +3433,7 @@ unsigned long sun4v_ncs_request(unsigned long request,
#define HV_FAST_REBOOT_DATA_SET 0x172
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_reboot_data_set(unsigned long ra,
unsigned long len);
#endif
@@ -3441,7 +3441,7 @@ unsigned long sun4v_reboot_data_set(unsigned long ra,
#define HV_FAST_VT_GET_PERFREG 0x184
#define HV_FAST_VT_SET_PERFREG 0x185
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_vt_get_perfreg(unsigned long reg_num,
unsigned long *reg_val);
unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
@@ -3451,7 +3451,7 @@ unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
#define HV_FAST_T5_GET_PERFREG 0x1a8
#define HV_FAST_T5_SET_PERFREG 0x1a9
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_t5_get_perfreg(unsigned long reg_num,
unsigned long *reg_val);
unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
@@ -3462,7 +3462,7 @@ unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
#define HV_FAST_M7_GET_PERFREG 0x43
#define HV_FAST_M7_SET_PERFREG 0x44
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_m7_get_perfreg(unsigned long reg_num,
unsigned long *reg_val);
unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
@@ -3506,7 +3506,7 @@ unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
#define HV_GRP_T5_CPU 0x0211
#define HV_GRP_DIAG 0x0300
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
unsigned long sun4v_get_version(unsigned long group,
unsigned long *major,
unsigned long *minor);
diff --git a/arch/sparc/include/asm/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
index 7ca3eaf3dace9..f5f20774faac1 100644
--- a/arch/sparc/include/asm/irqflags_32.h
+++ b/arch/sparc/include/asm/irqflags_32.h
@@ -11,7 +11,7 @@
#ifndef _ASM_IRQFLAGS_H
#define _ASM_IRQFLAGS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/psr.h>
@@ -43,6 +43,6 @@ static inline notrace bool arch_irqs_disabled(void)
return arch_irqs_disabled_flags(arch_local_save_flags());
}
-#endif /* (__ASSEMBLY__) */
+#endif /* (__ASSEMBLER__) */
#endif /* !(_ASM_IRQFLAGS_H) */
diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h
index c29ed571ae49e..0071566c2c223 100644
--- a/arch/sparc/include/asm/irqflags_64.h
+++ b/arch/sparc/include/asm/irqflags_64.h
@@ -13,7 +13,7 @@
#include <asm/pil.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline notrace unsigned long arch_local_save_flags(void)
{
@@ -93,6 +93,6 @@ static inline notrace unsigned long arch_local_irq_save(void)
return flags;
}
-#endif /* (__ASSEMBLY__) */
+#endif /* (__ASSEMBLER__) */
#endif /* !(_ASM_IRQFLAGS_H) */
diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h
index 2718cbea826a7..f49d1e6104e11 100644
--- a/arch/sparc/include/asm/jump_label.h
+++ b/arch/sparc/include/asm/jump_label.h
@@ -2,7 +2,7 @@
#ifndef _ASM_SPARC_JUMP_LABEL_H
#define _ASM_SPARC_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -48,5 +48,5 @@ struct jump_entry {
jump_label_t key;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/sparc/include/asm/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h
index 763d423823bdd..7627701a032cf 100644
--- a/arch/sparc/include/asm/kdebug_32.h
+++ b/arch/sparc/include/asm/kdebug_32.h
@@ -19,7 +19,7 @@
#define DEBUG_BP_TRAP 126
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* The debug vector is passed in %o1 at boot time. It is a pointer to
* a structure in the debuggers address space. Here is its format.
*/
@@ -64,7 +64,7 @@ enum die_val {
DIE_OOPS,
};
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/* Some nice offset defines for assembler code. */
#define KDEBUG_ENTRY_OFF 0x0
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index c1e05e4ab9e35..053a24b67aeda 100644
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -59,7 +59,7 @@
#define ASI_LEON3_SYSCTRL_CFG_SNOOPING (1 << 27)
#define ASI_LEON3_SYSCTRL_CFG_SSIZE(c) (1 << ((c >> 20) & 0xf))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* do a physical address bypass write, i.e. for 0x80000000 */
static inline void leon_store_reg(unsigned long paddr, unsigned long value)
@@ -132,7 +132,7 @@ static inline int sparc_leon3_cpuid(void)
return sparc_leon3_asr17() >> 28;
}
-#endif /*!__ASSEMBLY__*/
+#endif /*!__ASSEMBLER__*/
#ifdef CONFIG_SMP
# define LEON3_IRQ_IPI_DEFAULT 13
@@ -194,7 +194,7 @@ static inline int sparc_leon3_cpuid(void)
#define LEON2_CCR_DSETS_MASK 0x03000000UL
#define LEON2_CFG_SSIZE_MASK 0x00007000UL
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct vm_area_struct;
unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);
@@ -247,7 +247,7 @@ extern int leon_ipi_irq;
#endif /* CONFIG_SMP */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* macros used in leon_mm.c */
#define PFN(x) ((x) >> PAGE_SHIFT)
diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h
index 6433a93f51264..2ff5714d7a63a 100644
--- a/arch/sparc/include/asm/leon_amba.h
+++ b/arch/sparc/include/asm/leon_amba.h
@@ -8,7 +8,7 @@
#ifndef LEON_AMBA_H_INCLUDE
#define LEON_AMBA_H_INCLUDE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct amba_prom_registers {
unsigned int phys_addr; /* The physical address of this register */
@@ -89,7 +89,7 @@ struct amba_prom_registers {
#define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7)
#define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct leon3_irqctrl_regs_map {
u32 ilevel;
@@ -189,7 +189,7 @@ extern int leon_debug_irqout;
extern unsigned long leon3_gptimer_irq;
extern unsigned int sparc_leon_eirq;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define LEON3_IO_AREA 0xfff00000
#define LEON3_CONF_AREA 0xff000
diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h
index af9c10c83dc58..0ae05fbdc023e 100644
--- a/arch/sparc/include/asm/mman.h
+++ b/arch/sparc/include/asm/mman.h
@@ -4,7 +4,7 @@
#include <uapi/asm/mman.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len)
int sparc_mmap_check(unsigned long addr, unsigned long len);
@@ -87,5 +87,5 @@ static inline bool arch_validate_flags(unsigned long vm_flags)
}
#endif /* CONFIG_SPARC64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __SPARC_MMAN_H__ */
diff --git a/arch/sparc/include/asm/mmu_64.h b/arch/sparc/include/asm/mmu_64.h
index 7e2704c770e9f..4eeb938f3e61c 100644
--- a/arch/sparc/include/asm/mmu_64.h
+++ b/arch/sparc/include/asm/mmu_64.h
@@ -59,7 +59,7 @@
#define CTX_HWBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_HW_MASK)
#define CTX_NRBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_NR_MASK)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define TSB_ENTRY_ALIGNMENT 16
@@ -117,7 +117,7 @@ typedef struct {
spinlock_t tag_lock;
} mm_context_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define TSB_CONFIG_TSB 0x00
#define TSB_CONFIG_RSS_LIMIT 0x08
diff --git a/arch/sparc/include/asm/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h
index 509043f815602..d9ff73f776f93 100644
--- a/arch/sparc/include/asm/mmu_context_32.h
+++ b/arch/sparc/include/asm/mmu_context_32.h
@@ -2,7 +2,7 @@
#ifndef __SPARC_MMU_CONTEXT_H
#define __SPARC_MMU_CONTEXT_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/mm_hooks.h>
@@ -29,6 +29,6 @@ void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm,
#include <asm-generic/mmu_context.h>
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC_MMU_CONTEXT_H) */
diff --git a/arch/sparc/include/asm/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h
index 08160bf9a0f41..78bbacc14d2d9 100644
--- a/arch/sparc/include/asm/mmu_context_64.h
+++ b/arch/sparc/include/asm/mmu_context_64.h
@@ -4,7 +4,7 @@
/* Derived heavily from Linus's Alpha/AXP ASN code... */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/spinlock.h>
#include <linux/mm_types.h>
@@ -193,6 +193,6 @@ static inline unsigned long mm_untag_mask(struct mm_struct *mm)
#include <asm-generic/mmu_context.h>
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC64_MMU_CONTEXT_H) */
diff --git a/arch/sparc/include/asm/mxcc.h b/arch/sparc/include/asm/mxcc.h
index 3a2561bea4dd4..bd6339dcf693d 100644
--- a/arch/sparc/include/asm/mxcc.h
+++ b/arch/sparc/include/asm/mxcc.h
@@ -84,7 +84,7 @@
* MID: The moduleID of the cpu your read this from.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void mxcc_set_stream_src(unsigned long *paddr)
{
@@ -133,6 +133,6 @@ static inline void mxcc_set_creg(unsigned long mxcc_control)
"i" (ASI_M_MXCC));
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !(_SPARC_MXCC_H) */
diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h
index 1b151f738b00e..f1ad7f7bcac23 100644
--- a/arch/sparc/include/asm/obio.h
+++ b/arch/sparc/include/asm/obio.h
@@ -97,7 +97,7 @@
#define CC_EREG 0x1F00E00 /* Error code register */
#define CC_CID 0x1F00F04 /* Component ID */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline int bw_get_intr_mask(int sbus_level)
{
@@ -221,6 +221,6 @@ static inline void cc_set_igen(unsigned int gen)
"i" (ASI_M_MXCC));
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !(_SPARC_OBIO_H) */
diff --git a/arch/sparc/include/asm/openprom.h b/arch/sparc/include/asm/openprom.h
index 69545b3e54547..ce68000dffac3 100644
--- a/arch/sparc/include/asm/openprom.h
+++ b/arch/sparc/include/asm/openprom.h
@@ -11,7 +11,7 @@
/* Empirical constants... */
#define LINUX_OPPROM_MAGIC 0x10010407
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/of.h>
/* V0 prom device operations. */
@@ -275,6 +275,6 @@ struct linux_prom_pci_intmask {
unsigned int interrupt;
};
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC_OPENPROM_H) */
diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
index 9954254ea5698..c1bccbedf567e 100644
--- a/arch/sparc/include/asm/page_32.h
+++ b/arch/sparc/include/asm/page_32.h
@@ -13,7 +13,7 @@
#include <vdso/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
#define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE)
@@ -108,14 +108,14 @@ typedef pte_t *pgtable_t;
#define TASK_UNMAPPED_BASE 0x50000000
-#else /* !(__ASSEMBLY__) */
+#else /* !(__ASSEMBLER__) */
#define __pgprot(x) (x)
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#define PAGE_OFFSET 0xf0000000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long phys_base;
extern unsigned long pfn_base;
#endif
diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h
index 2a68ff5b6eabd..d764d8a8586bd 100644
--- a/arch/sparc/include/asm/page_64.h
+++ b/arch/sparc/include/asm/page_64.h
@@ -30,7 +30,7 @@
#define HUGE_MAX_HSTATE 5
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
struct pt_regs;
@@ -128,7 +128,7 @@ extern unsigned long sparc64_va_hole_bottom;
extern unsigned long PAGE_OFFSET;
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/* The maximum number of physical memory address bits we support. The
* largest value we can support is whatever "KPGD_SHIFT + KPTE_BITS"
@@ -139,7 +139,7 @@ extern unsigned long PAGE_OFFSET;
#define ILOG2_4MB 22
#define ILOG2_256MB 28
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __pa(x) ((unsigned long)(x) - PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
@@ -153,7 +153,7 @@ extern unsigned long PAGE_OFFSET;
#define virt_to_phys __pa
#define phys_to_virt __va
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#include <asm-generic/getorder.h>
diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
index 238376b1ffcc4..fb5ed6a59535a 100644
--- a/arch/sparc/include/asm/pcic.h
+++ b/arch/sparc/include/asm/pcic.h
@@ -8,7 +8,7 @@
#ifndef __SPARC_PCIC_H
#define __SPARC_PCIC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/smp.h>
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 62bcafe38b1f6..ff11ee1831786 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -21,7 +21,7 @@
#define PGDIR_MASK (~(PGDIR_SIZE-1))
#define PGDIR_ALIGN(__addr) (((__addr) + ~PGDIR_MASK) & PGDIR_MASK)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/pgtable-nopud.h>
#include <linux/spinlock.h>
@@ -428,7 +428,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
__changed; \
})
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#define VMALLOC_START _AC(0xfe600000,UL)
#define VMALLOC_END _AC(0xffc00000,UL)
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index 2b7f358762c18..f1ce04744df8c 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -79,7 +79,7 @@
#error PMD_SHIFT must equal HPAGE_SHIFT for transparent huge pages.
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long VMALLOC_END;
@@ -106,7 +106,7 @@ bool kern_addr_valid(unsigned long addr);
pr_err("%s:%d: bad pgd %p(%016lx) seen at (%pS)\n", \
__FILE__, __LINE__, &(e), pgd_val(e), __builtin_return_address(0))
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/* PTE bits which are the same in SUN4U and SUN4V format. */
#define _PAGE_VALID _AC(0x8000000000000000,UL) /* Valid TTE */
@@ -191,7 +191,7 @@ bool kern_addr_valid(unsigned long addr);
/* We borrow bit 20 to store the exclusive marker in swap PTEs. */
#define _PAGE_SWP_EXCLUSIVE _AC(0x0000000000100000, UL)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);
@@ -1181,6 +1181,6 @@ extern unsigned long pte_leaf_size(pte_t pte);
#endif /* CONFIG_HUGETLB_PAGE */
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(_SPARC64_PGTABLE_H) */
diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
index 18e68d43f0367..a265822a475ee 100644
--- a/arch/sparc/include/asm/pgtsrmmu.h
+++ b/arch/sparc/include/asm/pgtsrmmu.h
@@ -10,7 +10,7 @@
#include <asm/page.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/thread_info.h> /* TI_UWINMASK for WINDOW_FLUSH */
#endif
@@ -97,7 +97,7 @@
bne 99b; \
restore %g0, %g0, %g0;
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long last_valid_pfn;
/* This makes sense. Honest it does - Anton */
@@ -136,6 +136,6 @@ srmmu_get_pte (unsigned long addr)
return entry;
}
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(_SPARC_PGTSRMMU_H) */
diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
index 0a0d5c3d184c7..321859454ca4c 100644
--- a/arch/sparc/include/asm/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -21,7 +21,7 @@
* XXX No longer using virtual page tables, kill this upper limit...
*/
#define VA_BITS 44
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define VPTE_SIZE (1UL << (VA_BITS - PAGE_SHIFT + 3))
#else
#define VPTE_SIZE (1 << (VA_BITS - PAGE_SHIFT + 3))
@@ -45,7 +45,7 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* The Sparc processor specific thread struct. */
/* XXX This should die, everything can go into thread_info now. */
@@ -62,7 +62,7 @@ struct thread_struct {
#endif
};
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#ifndef CONFIG_DEBUG_SPINLOCK
#define INIT_THREAD { \
@@ -75,7 +75,7 @@ struct thread_struct {
}
#endif /* !(CONFIG_DEBUG_SPINLOCK) */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/fpumacro.h>
@@ -242,6 +242,6 @@ static inline void prefetchw(const void *x)
int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool illegal_insn_trap);
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__ASM_SPARC64_PROCESSOR_H) */
diff --git a/arch/sparc/include/asm/psr.h b/arch/sparc/include/asm/psr.h
index 65127ce565abc..5af50ccda0233 100644
--- a/arch/sparc/include/asm/psr.h
+++ b/arch/sparc/include/asm/psr.h
@@ -14,7 +14,7 @@
#include <uapi/asm/psr.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Get the %psr register. */
static inline unsigned int get_psr(void)
{
@@ -63,6 +63,6 @@ static inline unsigned int get_fsr(void)
return fsr;
}
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__LINUX_SPARC_PSR_H) */
diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
index d1419e6690274..8adf3fd2f00fe 100644
--- a/arch/sparc/include/asm/ptrace.h
+++ b/arch/sparc/include/asm/ptrace.h
@@ -5,7 +5,7 @@
#include <uapi/asm/ptrace.h>
#if defined(__sparc__) && defined(__arch64__)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler.h>
#include <linux/threads.h>
@@ -113,10 +113,10 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
{
return regs->u_regs[UREG_I6];
}
-#else /* __ASSEMBLY__ */
-#endif /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
+#endif /* __ASSEMBLER__ */
#else /* (defined(__sparc__) && defined(__arch64__)) */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/switch_to.h>
static inline bool pt_regs_is_syscall(struct pt_regs *regs)
@@ -144,8 +144,8 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs)
#define instruction_pointer(regs) ((regs)->pc)
#define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
unsigned long profile_pc(struct pt_regs *);
-#else /* (!__ASSEMBLY__) */
-#endif /* (!__ASSEMBLY__) */
+#else /* (!__ASSEMBLER__) */
+#endif /* (!__ASSEMBLER__) */
#endif /* (defined(__sparc__) && defined(__arch64__)) */
#define STACK_BIAS 2047
diff --git a/arch/sparc/include/asm/ross.h b/arch/sparc/include/asm/ross.h
index 79a54d66a2c0b..53a42b37495d0 100644
--- a/arch/sparc/include/asm/ross.h
+++ b/arch/sparc/include/asm/ross.h
@@ -95,7 +95,7 @@
#define HYPERSPARC_ICCR_FTD 0x00000002
#define HYPERSPARC_ICCR_ICE 0x00000001
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline unsigned int get_ross_icr(void)
{
@@ -187,6 +187,6 @@ static inline void hyper_flush_cache_page(unsigned long page)
}
}
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(_SPARC_ROSS_H) */
diff --git a/arch/sparc/include/asm/sbi.h b/arch/sparc/include/asm/sbi.h
index 4d6026c1e446f..861f85b5bf9bb 100644
--- a/arch/sparc/include/asm/sbi.h
+++ b/arch/sparc/include/asm/sbi.h
@@ -64,7 +64,7 @@ struct sbi_regs {
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline int acquire_sbi(int devid, int mask)
{
@@ -111,6 +111,6 @@ static inline void set_sbi_ctl(int devid, int cfgno, int cfg)
"i" (ASI_M_CTL));
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !(_SPARC_SBI_H) */
diff --git a/arch/sparc/include/asm/sigcontext.h b/arch/sparc/include/asm/sigcontext.h
index ee05f9d2bcf2c..200f95144fd29 100644
--- a/arch/sparc/include/asm/sigcontext.h
+++ b/arch/sparc/include/asm/sigcontext.h
@@ -5,7 +5,7 @@
#include <asm/ptrace.h>
#include <uapi/asm/sigcontext.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __SUNOS_MAXWIN 31
@@ -104,6 +104,6 @@ typedef struct {
#endif /* (CONFIG_SPARC64) */
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC_SIGCONTEXT_H) */
diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
index 28f81081e37da..d93fe93544ec6 100644
--- a/arch/sparc/include/asm/signal.h
+++ b/arch/sparc/include/asm/signal.h
@@ -2,16 +2,16 @@
#ifndef __SPARC_SIGNAL_H
#define __SPARC_SIGNAL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/personality.h>
#include <linux/types.h>
#endif
#include <uapi/asm/signal.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __ARCH_HAS_KA_RESTORER
#define __ARCH_HAS_SA_RESTORER
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC_SIGNAL_H) */
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h
index 2cf7971d7f6c9..9c6ed98fbaf12 100644
--- a/arch/sparc/include/asm/smp_32.h
+++ b/arch/sparc/include/asm/smp_32.h
@@ -10,15 +10,15 @@
#include <linux/threads.h>
#include <asm/head.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_SMP
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
#include <asm/asi.h>
@@ -105,7 +105,7 @@ int hard_smp_processor_id(void);
void smp_setup_cpu_possible_map(void);
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/* Sparc specific messages. */
#define MSG_CROSS_CALL 0x0005 /* run func on cpus */
diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h
index 0964fede0b2cc..759fb4a9530ed 100644
--- a/arch/sparc/include/asm/smp_64.h
+++ b/arch/sparc/include/asm/smp_64.h
@@ -12,16 +12,16 @@
#include <asm/starfire.h>
#include <asm/spitfire.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
#include <linux/cache.h>
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#ifdef CONFIG_SMP
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Private routines/data
@@ -68,7 +68,7 @@ int __cpu_disable(void);
void __cpu_die(unsigned int cpu);
#endif
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#else
diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index bc5aa6f616764..6d6d261bf8d2f 100644
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
@@ -7,7 +7,7 @@
#ifndef __SPARC_SPINLOCK_H
#define __SPARC_SPINLOCK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/psr.h>
#include <asm/barrier.h>
@@ -183,6 +183,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)
res; \
})
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* __SPARC_SPINLOCK_H */
diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
index 3a9a0b0c74654..13cd15d346be4 100644
--- a/arch/sparc/include/asm/spinlock_64.h
+++ b/arch/sparc/include/asm/spinlock_64.h
@@ -7,13 +7,13 @@
#ifndef __SPARC64_SPINLOCK_H
#define __SPARC64_SPINLOCK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <asm/barrier.h>
#include <asm/qspinlock.h>
#include <asm/qrwlock.h>
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(__SPARC64_SPINLOCK_H) */
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
index e9b7d25b29fae..79b9dd5e9ac68 100644
--- a/arch/sparc/include/asm/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
@@ -68,7 +68,7 @@
#define CPU_ID_M8 ('8')
#define CPU_ID_SONOMA1 ('N')
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum ultra_tlb_layout {
spitfire = 0,
@@ -363,6 +363,6 @@ static inline void cheetah_put_itlb_data(int entry, unsigned long data)
"i" (ASI_ITLB_DATA_ACCESS));
}
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* CONFIG_SPARC64 */
#endif /* !(_SPARC64_SPITFIRE_H) */
diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h
index fb1a8c499cb03..8e511ed787755 100644
--- a/arch/sparc/include/asm/starfire.h
+++ b/arch/sparc/include/asm/starfire.h
@@ -8,7 +8,7 @@
#ifndef _SPARC64_STARFIRE_H
#define _SPARC64_STARFIRE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int this_is_starfire;
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index 45b4955b253f2..fdaf7b171e0ac 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -14,7 +14,7 @@
#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
#include <asm/page.h>
@@ -72,7 +72,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
*/
#define THREAD_SIZE_ORDER 1
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* Size of kernel stack for each process */
#define THREAD_SIZE (2 * PAGE_SIZE)
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 1a44372e2bc07..c8a73dff27f80 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -26,7 +26,7 @@
#include <asm/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/ptrace.h>
#include <asm/types.h>
@@ -64,7 +64,7 @@ struct thread_info {
__attribute__ ((aligned(64)));
};
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/* offsets into the thread_info struct for assembly code access */
#define TI_TASK 0x00000000
@@ -110,7 +110,7 @@ struct thread_info {
/*
* macros/functions for gaining access to the thread information structure
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define INIT_THREAD_INFO(tsk) \
{ \
@@ -150,7 +150,7 @@ extern struct thread_info *current_thread_info(void);
#define set_thread_fpdepth(val) (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_FPDEPTH] = (val))
#define get_thread_wsaved() (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED])
#define set_thread_wsaved(val) (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED] = (val))
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
/*
* Thread information flags, only 16 bits are available as we encode
@@ -228,14 +228,14 @@ extern struct thread_info *current_thread_info(void);
* Note that there are only 8 bits available.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0)
#define test_thread_64bit_stack(__SP) \
((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \
false : true)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
index ace0d48e837e5..6cf2a60a0156d 100644
--- a/arch/sparc/include/asm/trap_block.h
+++ b/arch/sparc/include/asm/trap_block.h
@@ -7,7 +7,7 @@
#include <asm/hypervisor.h>
#include <asm/asi.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Trap handling code needs to get at a few critical values upon
* trap entry and to process TSB misses. These cannot be in the
@@ -91,7 +91,7 @@ extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,
__sun_m7_2insn_patch_end;
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#define TRAP_PER_CPU_THREAD 0x00
#define TRAP_PER_CPU_PGD_PADDR 0x08
diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h
index 2fba2602ba69c..e4e10b0e7887d 100644
--- a/arch/sparc/include/asm/traps.h
+++ b/arch/sparc/include/asm/traps.h
@@ -9,7 +9,7 @@
#include <uapi/asm/traps.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* This is for V8 compliant Sparc CPUS */
struct tt_entry {
unsigned long inst_one;
@@ -21,5 +21,5 @@ struct tt_entry {
/* We set this to _start in system setup. */
extern struct tt_entry *sparc_ttable;
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* !(_SPARC_TRAPS_H) */
diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
index 522a677e050d7..239be259e1669 100644
--- a/arch/sparc/include/asm/tsb.h
+++ b/arch/sparc/include/asm/tsb.h
@@ -59,7 +59,7 @@
* The kernel TSB is locked into the TLB by virtue of being in the
* kernel image, so we don't play these games for swapper_tsb access.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct tsb_ldquad_phys_patch_entry {
unsigned int addr;
unsigned int sun4u_insn;
diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h
index 8f64694080198..b32d3068cce12 100644
--- a/arch/sparc/include/asm/ttable.h
+++ b/arch/sparc/include/asm/ttable.h
@@ -5,7 +5,7 @@
#include <asm/utrap.h>
#include <asm/pil.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include <asm/thread_info.h>
#endif
diff --git a/arch/sparc/include/asm/turbosparc.h b/arch/sparc/include/asm/turbosparc.h
index 23df777f9cea5..5f73263b6ded8 100644
--- a/arch/sparc/include/asm/turbosparc.h
+++ b/arch/sparc/include/asm/turbosparc.h
@@ -57,7 +57,7 @@
#define TURBOSPARC_WTENABLE 0x00000020 /* Write thru for dcache */
#define TURBOSPARC_SNENABLE 0x40000000 /* DVMA snoop enable */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Bits [13:5] select one of 512 instruction cache tags */
static inline void turbosparc_inv_insn_tag(unsigned long addr)
@@ -121,6 +121,6 @@ static inline unsigned long turbosparc_get_ccreg(void)
return regval;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !(_SPARC_TURBOSPARC_H) */
diff --git a/arch/sparc/include/asm/upa.h b/arch/sparc/include/asm/upa.h
index 782691b30f545..b1df3a7f40ed0 100644
--- a/arch/sparc/include/asm/upa.h
+++ b/arch/sparc/include/asm/upa.h
@@ -24,7 +24,7 @@
#define UPA_PORTID_ID 0x000000000000ffff /* Module Identification bits */
/* UPA I/O space accessors */
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
static inline unsigned char _upa_readb(unsigned long addr)
{
unsigned char ret;
@@ -105,6 +105,6 @@ static inline void _upa_writeq(unsigned long q, unsigned long addr)
#define upa_writew(__w, __addr) (_upa_writew((__w), (unsigned long)(__addr)))
#define upa_writel(__l, __addr) (_upa_writel((__l), (unsigned long)(__addr)))
#define upa_writeq(__q, __addr) (_upa_writeq((__q), (unsigned long)(__addr)))
-#endif /* __KERNEL__ && !__ASSEMBLY__ */
+#endif /* __KERNEL__ && !__ASSEMBLER__ */
#endif /* !(_SPARC64_UPA_H) */
diff --git a/arch/sparc/include/asm/vaddrs.h b/arch/sparc/include/asm/vaddrs.h
index 4fec0341e2a81..da567600c8974 100644
--- a/arch/sparc/include/asm/vaddrs.h
+++ b/arch/sparc/include/asm/vaddrs.h
@@ -31,7 +31,7 @@
*/
#define SRMMU_NOCACHE_ALCRATIO 64 /* 256 pages per 64MB of system RAM */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/kmap_size.h>
enum fixed_addresses {
diff --git a/arch/sparc/include/asm/viking.h b/arch/sparc/include/asm/viking.h
index 08ffc605035f3..bbb714de43c42 100644
--- a/arch/sparc/include/asm/viking.h
+++ b/arch/sparc/include/asm/viking.h
@@ -110,7 +110,7 @@
#define VIKING_PTAG_DIRTY 0x00010000 /* Block has been modified */
#define VIKING_PTAG_SHARED 0x00000100 /* Shared with some other cache */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void viking_flush_icache(void)
{
@@ -250,6 +250,6 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr)
return val;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* !(_SPARC_VIKING_H) */
diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h
index 7903e84e09e05..71eb4e9afb3e0 100644
--- a/arch/sparc/include/asm/visasm.h
+++ b/arch/sparc/include/asm/visasm.h
@@ -45,7 +45,7 @@
#define VISExitHalfFast \
wr %o5, 0, %fprs;
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void save_and_clear_fpu(void) {
__asm__ __volatile__ (
" rd %%fprs, %%o5\n"
diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h
index 9a870f5dc3712..7612f15a261fe 100644
--- a/drivers/char/hw_random/n2rng.h
+++ b/drivers/char/hw_random/n2rng.h
@@ -48,7 +48,7 @@
#define HV_RNG_NUM_CONTROL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long sun4v_rng_get_diag_ctl(void);
extern unsigned long sun4v_rng_ctl_read_v1(unsigned long ctl_regs_ra,
unsigned long *state,
@@ -147,6 +147,6 @@ struct n2rng {
#define N2RNG_BUSY_LIMIT 100
#define N2RNG_HCHECK_LIMIT 100
-#endif /* !(__ASSEMBLY__) */
+#endif /* !(__ASSEMBLER__) */
#endif /* _N2RNG_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:10 ` [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-06-06 7:22 ` Thomas Huth
2025-07-30 7:12 ` Thomas Huth
2025-08-03 13:33 ` John Paul Adrian Glaubitz
2025-09-26 15:04 ` Andreas Larsson
2 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-06-06 7:22 UTC (permalink / raw)
To: David S. Miller, Andreas Larsson; +Cc: sparclinux
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: "David S. Miller" <davem@davemloft.net>
> Cc: Andreas Larsson <andreas@gaisler.com>
> Cc: sparclinux@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/sparc/include/asm/adi_64.h | 4 +-
> arch/sparc/include/asm/auxio.h | 4 +-
> arch/sparc/include/asm/auxio_32.h | 4 +-
> arch/sparc/include/asm/auxio_64.h | 4 +-
> arch/sparc/include/asm/cacheflush_64.h | 4 +-
> arch/sparc/include/asm/cpudata.h | 4 +-
> arch/sparc/include/asm/cpudata_64.h | 4 +-
> arch/sparc/include/asm/delay_64.h | 4 +-
> arch/sparc/include/asm/ftrace.h | 2 +-
> arch/sparc/include/asm/hvtramp.h | 2 +-
> arch/sparc/include/asm/hypervisor.h | 92 ++++++++++++-------------
> arch/sparc/include/asm/irqflags_32.h | 4 +-
> arch/sparc/include/asm/irqflags_64.h | 4 +-
> arch/sparc/include/asm/jump_label.h | 4 +-
> arch/sparc/include/asm/kdebug_32.h | 4 +-
> arch/sparc/include/asm/leon.h | 8 +--
> arch/sparc/include/asm/leon_amba.h | 6 +-
> arch/sparc/include/asm/mman.h | 4 +-
> arch/sparc/include/asm/mmu_64.h | 4 +-
> arch/sparc/include/asm/mmu_context_32.h | 4 +-
> arch/sparc/include/asm/mmu_context_64.h | 4 +-
> arch/sparc/include/asm/mxcc.h | 4 +-
> arch/sparc/include/asm/obio.h | 4 +-
> arch/sparc/include/asm/openprom.h | 4 +-
> arch/sparc/include/asm/page_32.h | 8 +--
> arch/sparc/include/asm/page_64.h | 8 +--
> arch/sparc/include/asm/pcic.h | 2 +-
> arch/sparc/include/asm/pgtable_32.h | 4 +-
> arch/sparc/include/asm/pgtable_64.h | 8 +--
> arch/sparc/include/asm/pgtsrmmu.h | 6 +-
> arch/sparc/include/asm/processor_64.h | 10 +--
> arch/sparc/include/asm/psr.h | 4 +-
> arch/sparc/include/asm/ptrace.h | 12 ++--
> arch/sparc/include/asm/ross.h | 4 +-
> arch/sparc/include/asm/sbi.h | 4 +-
> arch/sparc/include/asm/sigcontext.h | 4 +-
> arch/sparc/include/asm/signal.h | 6 +-
> arch/sparc/include/asm/smp_32.h | 8 +--
> arch/sparc/include/asm/smp_64.h | 8 +--
> arch/sparc/include/asm/spinlock_32.h | 4 +-
> arch/sparc/include/asm/spinlock_64.h | 4 +-
> arch/sparc/include/asm/spitfire.h | 4 +-
> arch/sparc/include/asm/starfire.h | 2 +-
> arch/sparc/include/asm/thread_info_32.h | 4 +-
> arch/sparc/include/asm/thread_info_64.h | 12 ++--
> arch/sparc/include/asm/trap_block.h | 4 +-
> arch/sparc/include/asm/traps.h | 4 +-
> arch/sparc/include/asm/tsb.h | 2 +-
> arch/sparc/include/asm/ttable.h | 2 +-
> arch/sparc/include/asm/turbosparc.h | 4 +-
> arch/sparc/include/asm/upa.h | 4 +-
> arch/sparc/include/asm/vaddrs.h | 2 +-
> arch/sparc/include/asm/viking.h | 4 +-
> arch/sparc/include/asm/visasm.h | 2 +-
> drivers/char/hw_random/n2rng.h | 4 +-
> 55 files changed, 172 insertions(+), 172 deletions(-)
>
> diff --git a/arch/sparc/include/asm/adi_64.h b/arch/sparc/include/asm/adi_64.h
> index 4301c6fd87f7a..0c066fdab6963 100644
> --- a/arch/sparc/include/asm/adi_64.h
> +++ b/arch/sparc/include/asm/adi_64.h
> @@ -9,7 +9,7 @@
>
> #include <linux/types.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct adi_caps {
> __u64 blksz;
> @@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void)
> return adi_state.caps.nbits;
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* !(__ASM_SPARC64_ADI_H) */
> diff --git a/arch/sparc/include/asm/auxio.h b/arch/sparc/include/asm/auxio.h
> index a2681052e9000..d0a933ed0d04b 100644
> --- a/arch/sparc/include/asm/auxio.h
> +++ b/arch/sparc/include/asm/auxio.h
> @@ -2,11 +2,11 @@
> #ifndef ___ASM_SPARC_AUXIO_H
> #define ___ASM_SPARC_AUXIO_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern void __iomem *auxio_register;
>
> -#endif /* ifndef __ASSEMBLY__ */
> +#endif /* ifndef __ASSEMBLER__ */
>
> #if defined(__sparc__) && defined(__arch64__)
> #include <asm/auxio_64.h>
> diff --git a/arch/sparc/include/asm/auxio_32.h b/arch/sparc/include/asm/auxio_32.h
> index 852457c7a265a..db58fa28de9ec 100644
> --- a/arch/sparc/include/asm/auxio_32.h
> +++ b/arch/sparc/include/asm/auxio_32.h
> @@ -29,7 +29,7 @@
> #define AUXIO_FLPY_EJCT 0x02 /* Eject floppy disk. Write only. */
> #define AUXIO_LED 0x01 /* On if set, off if unset. Read/Write */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * NOTE: these routines are implementation dependent--
> @@ -75,7 +75,7 @@ do { \
> } \
> } while (0)
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
>
> /* AUXIO2 (Power Off Control) */
> diff --git a/arch/sparc/include/asm/auxio_64.h b/arch/sparc/include/asm/auxio_64.h
> index ae1ed41987db7..8a4ae07daf168 100644
> --- a/arch/sparc/include/asm/auxio_64.h
> +++ b/arch/sparc/include/asm/auxio_64.h
> @@ -74,7 +74,7 @@
> #define AUXIO_PCIO_CPWR_OFF 0x02 /* Courtesy Power Off */
> #define AUXIO_PCIO_SPWR_OFF 0x01 /* System Power Off */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define AUXIO_LTE_ON 1
> #define AUXIO_LTE_OFF 0
> @@ -94,6 +94,6 @@ void auxio_set_lte(int on);
> */
> void auxio_set_led(int on);
>
> -#endif /* ifndef __ASSEMBLY__ */
> +#endif /* ifndef __ASSEMBLER__ */
>
> #endif /* !(_SPARC64_AUXIO_H) */
> diff --git a/arch/sparc/include/asm/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h
> index 2b1261b77ecd1..06092572c0455 100644
> --- a/arch/sparc/include/asm/cacheflush_64.h
> +++ b/arch/sparc/include/asm/cacheflush_64.h
> @@ -4,7 +4,7 @@
>
> #include <asm/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/mm.h>
>
> @@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *,
> #define flush_cache_vmap_early(start, end) do { } while (0)
> #define flush_cache_vunmap(start, end) do { } while (0)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* _SPARC64_CACHEFLUSH_H */
> diff --git a/arch/sparc/include/asm/cpudata.h b/arch/sparc/include/asm/cpudata.h
> index d213165ee713b..67022a153023f 100644
> --- a/arch/sparc/include/asm/cpudata.h
> +++ b/arch/sparc/include/asm/cpudata.h
> @@ -2,14 +2,14 @@
> #ifndef ___ASM_SPARC_CPUDATA_H
> #define ___ASM_SPARC_CPUDATA_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/threads.h>
> #include <linux/percpu.h>
>
> extern const struct seq_operations cpuinfo_op;
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #if defined(__sparc__) && defined(__arch64__)
> #include <asm/cpudata_64.h>
> diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
> index 9c3fc03abe9ae..056b3c0e7ef94 100644
> --- a/arch/sparc/include/asm/cpudata_64.h
> +++ b/arch/sparc/include/asm/cpudata_64.h
> @@ -7,7 +7,7 @@
> #ifndef _SPARC64_CPUDATA_H
> #define _SPARC64_CPUDATA_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> typedef struct {
> /* Dcache line 1 */
> @@ -35,7 +35,7 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
> #define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
> #define local_cpu_data() (*this_cpu_ptr(&__cpu_data))
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #include <asm/trap_block.h>
>
> diff --git a/arch/sparc/include/asm/delay_64.h b/arch/sparc/include/asm/delay_64.h
> index 22213b1c119d2..5de5b5f23188c 100644
> --- a/arch/sparc/include/asm/delay_64.h
> +++ b/arch/sparc/include/asm/delay_64.h
> @@ -7,12 +7,12 @@
> #ifndef _SPARC64_DELAY_H
> #define _SPARC64_DELAY_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> void __delay(unsigned long loops);
> void udelay(unsigned long usecs);
> #define mdelay(n) udelay((n) * 1000)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* _SPARC64_DELAY_H */
> diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/ftrace.h
> index e284394cb3aa2..f7c9036199c5e 100644
> --- a/arch/sparc/include/asm/ftrace.h
> +++ b/arch/sparc/include/asm/ftrace.h
> @@ -6,7 +6,7 @@
> #define MCOUNT_ADDR ((unsigned long)(_mcount))
> #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void _mcount(void);
> #endif
>
> diff --git a/arch/sparc/include/asm/hvtramp.h b/arch/sparc/include/asm/hvtramp.h
> index ce2453ea4f2be..8cf7a54fa528a 100644
> --- a/arch/sparc/include/asm/hvtramp.h
> +++ b/arch/sparc/include/asm/hvtramp.h
> @@ -2,7 +2,7 @@
> #ifndef _SPARC64_HVTRAP_H
> #define _SPARC64_HVTRAP_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
>
> diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
> index f220edcf17c7c..94ac56d43746b 100644
> --- a/arch/sparc/include/asm/hypervisor.h
> +++ b/arch/sparc/include/asm/hypervisor.h
> @@ -102,7 +102,7 @@
> */
> #define HV_FAST_MACH_EXIT 0x00
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void sun4v_mach_exit(unsigned long exit_code);
> #endif
>
> @@ -131,7 +131,7 @@ void sun4v_mach_exit(unsigned long exit_code);
> */
> #define HV_FAST_MACH_DESC 0x01
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mach_desc(unsigned long buffer_pa,
> unsigned long buf_len,
> unsigned long *real_buf_len);
> @@ -152,7 +152,7 @@ unsigned long sun4v_mach_desc(unsigned long buffer_pa,
> */
> #define HV_FAST_MACH_SIR 0x02
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void sun4v_mach_sir(void);
> #endif
>
> @@ -208,7 +208,7 @@ void sun4v_mach_sir(void);
> */
> #define HV_FAST_MACH_SET_WATCHDOG 0x05
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
> unsigned long *orig_timeout);
> #endif
> @@ -254,7 +254,7 @@ unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
> */
> #define HV_FAST_CPU_START 0x10
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_start(unsigned long cpuid,
> unsigned long pc,
> unsigned long rtba,
> @@ -282,7 +282,7 @@ unsigned long sun4v_cpu_start(unsigned long cpuid,
> */
> #define HV_FAST_CPU_STOP 0x11
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_stop(unsigned long cpuid);
> #endif
>
> @@ -299,7 +299,7 @@ unsigned long sun4v_cpu_stop(unsigned long cpuid);
> */
> #define HV_FAST_CPU_YIELD 0x12
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_yield(void);
> #endif
>
> @@ -317,7 +317,7 @@ unsigned long sun4v_cpu_yield(void);
> */
> #define HV_FAST_CPU_POKE 0x13
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_poke(unsigned long cpuid);
> #endif
>
> @@ -363,7 +363,7 @@ unsigned long sun4v_cpu_poke(unsigned long cpuid);
> #define HV_CPU_QUEUE_RES_ERROR 0x3e
> #define HV_CPU_QUEUE_NONRES_ERROR 0x3f
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_qconf(unsigned long type,
> unsigned long queue_paddr,
> unsigned long num_queue_entries);
> @@ -416,7 +416,7 @@ unsigned long sun4v_cpu_qconf(unsigned long type,
> */
> #define HV_FAST_CPU_MONDO_SEND 0x42
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
> unsigned long cpu_list_pa,
> unsigned long mondo_block_pa);
> @@ -449,7 +449,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
> #define HV_CPU_STATE_RUNNING 0x02
> #define HV_CPU_STATE_ERROR 0x03
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> long sun4v_cpu_state(unsigned long cpuid);
> #endif
>
> @@ -485,7 +485,7 @@ long sun4v_cpu_state(unsigned long cpuid);
> *
> * Layout of a TSB description for mmu_tsb_ctx{,non}0() calls.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_tsb_descr {
> unsigned short pgsz_idx;
> unsigned short assoc;
> @@ -536,7 +536,7 @@ struct hv_tsb_descr {
> * The fault status block is a multiple of 64-bytes and must be aligned
> * on a 64-byte boundary.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_fault_status {
> unsigned long i_fault_type;
> unsigned long i_fault_addr;
> @@ -651,7 +651,7 @@ struct hv_fault_status {
> */
> #define HV_FAST_MMU_TSB_CTX0 0x20
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
> unsigned long tsb_desc_ra);
> #endif
> @@ -736,7 +736,7 @@ unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
> */
> #define HV_FAST_MMU_DEMAP_ALL 0x24
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void sun4v_mmu_demap_all(void);
> #endif
>
> @@ -766,7 +766,7 @@ void sun4v_mmu_demap_all(void);
> */
> #define HV_FAST_MMU_MAP_PERM_ADDR 0x25
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
> unsigned long set_to_zero,
> unsigned long tte,
> @@ -990,7 +990,7 @@ unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
> */
>
> #define HV_CCB_SUBMIT 0x34
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
> unsigned long len,
> unsigned long flags,
> @@ -1035,7 +1035,7 @@ unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
> */
>
> #define HV_CCB_INFO 0x35
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ccb_info(unsigned long ca,
> void *info_arr);
> #endif
> @@ -1069,7 +1069,7 @@ unsigned long sun4v_ccb_info(unsigned long ca,
> */
>
> #define HV_CCB_KILL 0x36
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ccb_kill(unsigned long ca,
> void *kill_status);
> #endif
> @@ -1104,7 +1104,7 @@ unsigned long sun4v_ccb_kill(unsigned long ca,
> */
> #define HV_FAST_TOD_GET 0x50
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_tod_get(unsigned long *time);
> #endif
>
> @@ -1121,7 +1121,7 @@ unsigned long sun4v_tod_get(unsigned long *time);
> */
> #define HV_FAST_TOD_SET 0x51
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_tod_set(unsigned long time);
> #endif
>
> @@ -1197,7 +1197,7 @@ unsigned long sun4v_tod_set(unsigned long time);
> */
> #define HV_FAST_CONS_WRITE 0x63
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> long sun4v_con_getchar(long *status);
> long sun4v_con_putchar(long c);
> long sun4v_con_read(unsigned long buffer,
> @@ -1239,7 +1239,7 @@ unsigned long sun4v_con_write(unsigned long buffer,
> #define HV_SOFT_STATE_NORMAL 0x01
> #define HV_SOFT_STATE_TRANSITION 0x02
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
> unsigned long msg_string_ra);
> #endif
> @@ -1318,7 +1318,7 @@ unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
> */
> #define HV_FAST_SVC_CLRSTATUS 0x84
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_svc_send(unsigned long svc_id,
> unsigned long buffer,
> unsigned long buffer_size,
> @@ -1348,7 +1348,7 @@ unsigned long sun4v_svc_clrstatus(unsigned long svc_id,
> * start (offset 0) of the trap trace buffer, and is described as
> * follows:
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_trap_trace_control {
> unsigned long head_offset;
> unsigned long tail_offset;
> @@ -1367,7 +1367,7 @@ struct hv_trap_trace_control {
> *
> * Each trap trace buffer entry is laid out as follows:
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_trap_trace_entry {
> unsigned char type; /* Hypervisor or guest entry? */
> unsigned char hpstate; /* Hyper-privileged state */
> @@ -1617,7 +1617,7 @@ struct hv_trap_trace_entry {
> */
> #define HV_FAST_INTR_DEVINO2SYSINO 0xa0
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
> unsigned long devino);
> #endif
> @@ -1635,7 +1635,7 @@ unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
> */
> #define HV_FAST_INTR_GETENABLED 0xa1
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_getenabled(unsigned long sysino);
> #endif
>
> @@ -1651,7 +1651,7 @@ unsigned long sun4v_intr_getenabled(unsigned long sysino);
> */
> #define HV_FAST_INTR_SETENABLED 0xa2
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_setenabled(unsigned long sysino,
> unsigned long intr_enabled);
> #endif
> @@ -1668,7 +1668,7 @@ unsigned long sun4v_intr_setenabled(unsigned long sysino,
> */
> #define HV_FAST_INTR_GETSTATE 0xa3
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_getstate(unsigned long sysino);
> #endif
>
> @@ -1688,7 +1688,7 @@ unsigned long sun4v_intr_getstate(unsigned long sysino);
> */
> #define HV_FAST_INTR_SETSTATE 0xa4
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state);
> #endif
>
> @@ -1706,7 +1706,7 @@ unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state
> */
> #define HV_FAST_INTR_GETTARGET 0xa5
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_gettarget(unsigned long sysino);
> #endif
>
> @@ -1723,7 +1723,7 @@ unsigned long sun4v_intr_gettarget(unsigned long sysino);
> */
> #define HV_FAST_INTR_SETTARGET 0xa6
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
> #endif
>
> @@ -1807,7 +1807,7 @@ unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
> */
> #define HV_FAST_VINTR_SET_TARGET 0xae
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_vintr_get_cookie(unsigned long dev_handle,
> unsigned long dev_ino,
> unsigned long *cookie);
> @@ -3047,7 +3047,7 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
> #define LDC_MTE_SZ64K 0x0000000000000001 /* 64K page */
> #define LDC_MTE_SZ8K 0x0000000000000000 /* 8K page */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct ldc_mtable_entry {
> unsigned long mte;
> unsigned long cookie;
> @@ -3130,7 +3130,7 @@ struct ldc_mtable_entry {
> */
> #define HV_FAST_LDC_REVOKE 0xef
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ldc_tx_qconf(unsigned long channel,
> unsigned long ra,
> unsigned long num_entries);
> @@ -3230,7 +3230,7 @@ unsigned long sun4v_ldc_revoke(unsigned long channel,
> #define HV_FAST_N2_GET_PERFREG 0x104
> #define HV_FAST_N2_SET_PERFREG 0x105
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_niagara_getperf(unsigned long reg,
> unsigned long *val);
> unsigned long sun4v_niagara_setperf(unsigned long reg,
> @@ -3247,7 +3247,7 @@ unsigned long sun4v_niagara2_setperf(unsigned long reg,
> * a buffer where these statistics can be collected. It is continually
> * updated once configured. The layout is as follows:
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_mmu_statistics {
> unsigned long immu_tsb_hits_ctx0_8k_tte;
> unsigned long immu_tsb_ticks_ctx0_8k_tte;
> @@ -3332,7 +3332,7 @@ struct hv_mmu_statistics {
> */
> #define HV_FAST_MMUSTAT_INFO 0x103
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mmustat_conf(unsigned long ra, unsigned long *orig_ra);
> unsigned long sun4v_mmustat_info(unsigned long *ra);
> #endif
> @@ -3343,7 +3343,7 @@ unsigned long sun4v_mmustat_info(unsigned long *ra);
> #define HV_NCS_QCONF 0x01
> #define HV_NCS_QTAIL_UPDATE 0x02
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_ncs_queue_entry {
> /* MAU Control Register */
> unsigned long mau_control;
> @@ -3422,7 +3422,7 @@ struct hv_ncs_qtail_update_arg {
> */
> #define HV_FAST_NCS_REQUEST 0x110
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ncs_request(unsigned long request,
> unsigned long arg_ra,
> unsigned long arg_size);
> @@ -3433,7 +3433,7 @@ unsigned long sun4v_ncs_request(unsigned long request,
>
> #define HV_FAST_REBOOT_DATA_SET 0x172
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_reboot_data_set(unsigned long ra,
> unsigned long len);
> #endif
> @@ -3441,7 +3441,7 @@ unsigned long sun4v_reboot_data_set(unsigned long ra,
> #define HV_FAST_VT_GET_PERFREG 0x184
> #define HV_FAST_VT_SET_PERFREG 0x185
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_vt_get_perfreg(unsigned long reg_num,
> unsigned long *reg_val);
> unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
> @@ -3451,7 +3451,7 @@ unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
> #define HV_FAST_T5_GET_PERFREG 0x1a8
> #define HV_FAST_T5_SET_PERFREG 0x1a9
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_t5_get_perfreg(unsigned long reg_num,
> unsigned long *reg_val);
> unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
> @@ -3462,7 +3462,7 @@ unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
> #define HV_FAST_M7_GET_PERFREG 0x43
> #define HV_FAST_M7_SET_PERFREG 0x44
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_m7_get_perfreg(unsigned long reg_num,
> unsigned long *reg_val);
> unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
> @@ -3506,7 +3506,7 @@ unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
> #define HV_GRP_T5_CPU 0x0211
> #define HV_GRP_DIAG 0x0300
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_get_version(unsigned long group,
> unsigned long *major,
> unsigned long *minor);
> diff --git a/arch/sparc/include/asm/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
> index 7ca3eaf3dace9..f5f20774faac1 100644
> --- a/arch/sparc/include/asm/irqflags_32.h
> +++ b/arch/sparc/include/asm/irqflags_32.h
> @@ -11,7 +11,7 @@
> #ifndef _ASM_IRQFLAGS_H
> #define _ASM_IRQFLAGS_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <asm/psr.h>
> @@ -43,6 +43,6 @@ static inline notrace bool arch_irqs_disabled(void)
> return arch_irqs_disabled_flags(arch_local_save_flags());
> }
>
> -#endif /* (__ASSEMBLY__) */
> +#endif /* (__ASSEMBLER__) */
>
> #endif /* !(_ASM_IRQFLAGS_H) */
> diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h
> index c29ed571ae49e..0071566c2c223 100644
> --- a/arch/sparc/include/asm/irqflags_64.h
> +++ b/arch/sparc/include/asm/irqflags_64.h
> @@ -13,7 +13,7 @@
>
> #include <asm/pil.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline notrace unsigned long arch_local_save_flags(void)
> {
> @@ -93,6 +93,6 @@ static inline notrace unsigned long arch_local_irq_save(void)
> return flags;
> }
>
> -#endif /* (__ASSEMBLY__) */
> +#endif /* (__ASSEMBLER__) */
>
> #endif /* !(_ASM_IRQFLAGS_H) */
> diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h
> index 2718cbea826a7..f49d1e6104e11 100644
> --- a/arch/sparc/include/asm/jump_label.h
> +++ b/arch/sparc/include/asm/jump_label.h
> @@ -2,7 +2,7 @@
> #ifndef _ASM_SPARC_JUMP_LABEL_H
> #define _ASM_SPARC_JUMP_LABEL_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
>
> @@ -48,5 +48,5 @@ struct jump_entry {
> jump_label_t key;
> };
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif
> diff --git a/arch/sparc/include/asm/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h
> index 763d423823bdd..7627701a032cf 100644
> --- a/arch/sparc/include/asm/kdebug_32.h
> +++ b/arch/sparc/include/asm/kdebug_32.h
> @@ -19,7 +19,7 @@
>
> #define DEBUG_BP_TRAP 126
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /* The debug vector is passed in %o1 at boot time. It is a pointer to
> * a structure in the debuggers address space. Here is its format.
> */
> @@ -64,7 +64,7 @@ enum die_val {
> DIE_OOPS,
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* Some nice offset defines for assembler code. */
> #define KDEBUG_ENTRY_OFF 0x0
> diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
> index c1e05e4ab9e35..053a24b67aeda 100644
> --- a/arch/sparc/include/asm/leon.h
> +++ b/arch/sparc/include/asm/leon.h
> @@ -59,7 +59,7 @@
> #define ASI_LEON3_SYSCTRL_CFG_SNOOPING (1 << 27)
> #define ASI_LEON3_SYSCTRL_CFG_SSIZE(c) (1 << ((c >> 20) & 0xf))
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* do a physical address bypass write, i.e. for 0x80000000 */
> static inline void leon_store_reg(unsigned long paddr, unsigned long value)
> @@ -132,7 +132,7 @@ static inline int sparc_leon3_cpuid(void)
> return sparc_leon3_asr17() >> 28;
> }
>
> -#endif /*!__ASSEMBLY__*/
> +#endif /*!__ASSEMBLER__*/
>
> #ifdef CONFIG_SMP
> # define LEON3_IRQ_IPI_DEFAULT 13
> @@ -194,7 +194,7 @@ static inline int sparc_leon3_cpuid(void)
> #define LEON2_CCR_DSETS_MASK 0x03000000UL
> #define LEON2_CFG_SSIZE_MASK 0x00007000UL
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct vm_area_struct;
>
> unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);
> @@ -247,7 +247,7 @@ extern int leon_ipi_irq;
>
> #endif /* CONFIG_SMP */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /* macros used in leon_mm.c */
> #define PFN(x) ((x) >> PAGE_SHIFT)
> diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h
> index 6433a93f51264..2ff5714d7a63a 100644
> --- a/arch/sparc/include/asm/leon_amba.h
> +++ b/arch/sparc/include/asm/leon_amba.h
> @@ -8,7 +8,7 @@
> #ifndef LEON_AMBA_H_INCLUDE
> #define LEON_AMBA_H_INCLUDE
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct amba_prom_registers {
> unsigned int phys_addr; /* The physical address of this register */
> @@ -89,7 +89,7 @@ struct amba_prom_registers {
> #define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7)
> #define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct leon3_irqctrl_regs_map {
> u32 ilevel;
> @@ -189,7 +189,7 @@ extern int leon_debug_irqout;
> extern unsigned long leon3_gptimer_irq;
> extern unsigned int sparc_leon_eirq;
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #define LEON3_IO_AREA 0xfff00000
> #define LEON3_CONF_AREA 0xff000
> diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h
> index af9c10c83dc58..0ae05fbdc023e 100644
> --- a/arch/sparc/include/asm/mman.h
> +++ b/arch/sparc/include/asm/mman.h
> @@ -4,7 +4,7 @@
>
> #include <uapi/asm/mman.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len)
> int sparc_mmap_check(unsigned long addr, unsigned long len);
>
> @@ -87,5 +87,5 @@ static inline bool arch_validate_flags(unsigned long vm_flags)
> }
> #endif /* CONFIG_SPARC64 */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __SPARC_MMAN_H__ */
> diff --git a/arch/sparc/include/asm/mmu_64.h b/arch/sparc/include/asm/mmu_64.h
> index 7e2704c770e9f..4eeb938f3e61c 100644
> --- a/arch/sparc/include/asm/mmu_64.h
> +++ b/arch/sparc/include/asm/mmu_64.h
> @@ -59,7 +59,7 @@
> #define CTX_HWBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_HW_MASK)
> #define CTX_NRBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_NR_MASK)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define TSB_ENTRY_ALIGNMENT 16
>
> @@ -117,7 +117,7 @@ typedef struct {
> spinlock_t tag_lock;
> } mm_context_t;
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #define TSB_CONFIG_TSB 0x00
> #define TSB_CONFIG_RSS_LIMIT 0x08
> diff --git a/arch/sparc/include/asm/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h
> index 509043f815602..d9ff73f776f93 100644
> --- a/arch/sparc/include/asm/mmu_context_32.h
> +++ b/arch/sparc/include/asm/mmu_context_32.h
> @@ -2,7 +2,7 @@
> #ifndef __SPARC_MMU_CONTEXT_H
> #define __SPARC_MMU_CONTEXT_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm-generic/mm_hooks.h>
>
> @@ -29,6 +29,6 @@ void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm,
>
> #include <asm-generic/mmu_context.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC_MMU_CONTEXT_H) */
> diff --git a/arch/sparc/include/asm/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h
> index 08160bf9a0f41..78bbacc14d2d9 100644
> --- a/arch/sparc/include/asm/mmu_context_64.h
> +++ b/arch/sparc/include/asm/mmu_context_64.h
> @@ -4,7 +4,7 @@
>
> /* Derived heavily from Linus's Alpha/AXP ASN code... */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/spinlock.h>
> #include <linux/mm_types.h>
> @@ -193,6 +193,6 @@ static inline unsigned long mm_untag_mask(struct mm_struct *mm)
>
> #include <asm-generic/mmu_context.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC64_MMU_CONTEXT_H) */
> diff --git a/arch/sparc/include/asm/mxcc.h b/arch/sparc/include/asm/mxcc.h
> index 3a2561bea4dd4..bd6339dcf693d 100644
> --- a/arch/sparc/include/asm/mxcc.h
> +++ b/arch/sparc/include/asm/mxcc.h
> @@ -84,7 +84,7 @@
> * MID: The moduleID of the cpu your read this from.
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline void mxcc_set_stream_src(unsigned long *paddr)
> {
> @@ -133,6 +133,6 @@ static inline void mxcc_set_creg(unsigned long mxcc_control)
> "i" (ASI_M_MXCC));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_MXCC_H) */
> diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h
> index 1b151f738b00e..f1ad7f7bcac23 100644
> --- a/arch/sparc/include/asm/obio.h
> +++ b/arch/sparc/include/asm/obio.h
> @@ -97,7 +97,7 @@
> #define CC_EREG 0x1F00E00 /* Error code register */
> #define CC_CID 0x1F00F04 /* Component ID */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline int bw_get_intr_mask(int sbus_level)
> {
> @@ -221,6 +221,6 @@ static inline void cc_set_igen(unsigned int gen)
> "i" (ASI_M_MXCC));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_OBIO_H) */
> diff --git a/arch/sparc/include/asm/openprom.h b/arch/sparc/include/asm/openprom.h
> index 69545b3e54547..ce68000dffac3 100644
> --- a/arch/sparc/include/asm/openprom.h
> +++ b/arch/sparc/include/asm/openprom.h
> @@ -11,7 +11,7 @@
> /* Empirical constants... */
> #define LINUX_OPPROM_MAGIC 0x10010407
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/of.h>
>
> /* V0 prom device operations. */
> @@ -275,6 +275,6 @@ struct linux_prom_pci_intmask {
> unsigned int interrupt;
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC_OPENPROM_H) */
> diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
> index 9954254ea5698..c1bccbedf567e 100644
> --- a/arch/sparc/include/asm/page_32.h
> +++ b/arch/sparc/include/asm/page_32.h
> @@ -13,7 +13,7 @@
>
> #include <vdso/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
> #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE)
> @@ -108,14 +108,14 @@ typedef pte_t *pgtable_t;
>
> #define TASK_UNMAPPED_BASE 0x50000000
>
> -#else /* !(__ASSEMBLY__) */
> +#else /* !(__ASSEMBLER__) */
>
> #define __pgprot(x) (x)
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #define PAGE_OFFSET 0xf0000000
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long phys_base;
> extern unsigned long pfn_base;
> #endif
> diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h
> index 2a68ff5b6eabd..d764d8a8586bd 100644
> --- a/arch/sparc/include/asm/page_64.h
> +++ b/arch/sparc/include/asm/page_64.h
> @@ -30,7 +30,7 @@
> #define HUGE_MAX_HSTATE 5
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
> struct pt_regs;
> @@ -128,7 +128,7 @@ extern unsigned long sparc64_va_hole_bottom;
>
> extern unsigned long PAGE_OFFSET;
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* The maximum number of physical memory address bits we support. The
> * largest value we can support is whatever "KPGD_SHIFT + KPTE_BITS"
> @@ -139,7 +139,7 @@ extern unsigned long PAGE_OFFSET;
> #define ILOG2_4MB 22
> #define ILOG2_256MB 28
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET)
> #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
> @@ -153,7 +153,7 @@ extern unsigned long PAGE_OFFSET;
> #define virt_to_phys __pa
> #define phys_to_virt __va
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #include <asm-generic/getorder.h>
>
> diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
> index 238376b1ffcc4..fb5ed6a59535a 100644
> --- a/arch/sparc/include/asm/pcic.h
> +++ b/arch/sparc/include/asm/pcic.h
> @@ -8,7 +8,7 @@
> #ifndef __SPARC_PCIC_H
> #define __SPARC_PCIC_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <linux/smp.h>
> diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
> index 62bcafe38b1f6..ff11ee1831786 100644
> --- a/arch/sparc/include/asm/pgtable_32.h
> +++ b/arch/sparc/include/asm/pgtable_32.h
> @@ -21,7 +21,7 @@
> #define PGDIR_MASK (~(PGDIR_SIZE-1))
> #define PGDIR_ALIGN(__addr) (((__addr) + ~PGDIR_MASK) & PGDIR_MASK)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm-generic/pgtable-nopud.h>
>
> #include <linux/spinlock.h>
> @@ -428,7 +428,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
> __changed; \
> })
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #define VMALLOC_START _AC(0xfe600000,UL)
> #define VMALLOC_END _AC(0xffc00000,UL)
> diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
> index 2b7f358762c18..f1ce04744df8c 100644
> --- a/arch/sparc/include/asm/pgtable_64.h
> +++ b/arch/sparc/include/asm/pgtable_64.h
> @@ -79,7 +79,7 @@
> #error PMD_SHIFT must equal HPAGE_SHIFT for transparent huge pages.
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern unsigned long VMALLOC_END;
>
> @@ -106,7 +106,7 @@ bool kern_addr_valid(unsigned long addr);
> pr_err("%s:%d: bad pgd %p(%016lx) seen at (%pS)\n", \
> __FILE__, __LINE__, &(e), pgd_val(e), __builtin_return_address(0))
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* PTE bits which are the same in SUN4U and SUN4V format. */
> #define _PAGE_VALID _AC(0x8000000000000000,UL) /* Valid TTE */
> @@ -191,7 +191,7 @@ bool kern_addr_valid(unsigned long addr);
> /* We borrow bit 20 to store the exclusive marker in swap PTEs. */
> #define _PAGE_SWP_EXCLUSIVE _AC(0x0000000000100000, UL)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);
>
> @@ -1181,6 +1181,6 @@ extern unsigned long pte_leaf_size(pte_t pte);
>
> #endif /* CONFIG_HUGETLB_PAGE */
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(_SPARC64_PGTABLE_H) */
> diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
> index 18e68d43f0367..a265822a475ee 100644
> --- a/arch/sparc/include/asm/pgtsrmmu.h
> +++ b/arch/sparc/include/asm/pgtsrmmu.h
> @@ -10,7 +10,7 @@
>
> #include <asm/page.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
> #include <asm/thread_info.h> /* TI_UWINMASK for WINDOW_FLUSH */
> #endif
>
> @@ -97,7 +97,7 @@
> bne 99b; \
> restore %g0, %g0, %g0;
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long last_valid_pfn;
>
> /* This makes sense. Honest it does - Anton */
> @@ -136,6 +136,6 @@ srmmu_get_pte (unsigned long addr)
> return entry;
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(_SPARC_PGTSRMMU_H) */
> diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
> index 0a0d5c3d184c7..321859454ca4c 100644
> --- a/arch/sparc/include/asm/processor_64.h
> +++ b/arch/sparc/include/asm/processor_64.h
> @@ -21,7 +21,7 @@
> * XXX No longer using virtual page tables, kill this upper limit...
> */
> #define VA_BITS 44
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define VPTE_SIZE (1UL << (VA_BITS - PAGE_SHIFT + 3))
> #else
> #define VPTE_SIZE (1 << (VA_BITS - PAGE_SHIFT + 3))
> @@ -45,7 +45,7 @@
>
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* The Sparc processor specific thread struct. */
> /* XXX This should die, everything can go into thread_info now. */
> @@ -62,7 +62,7 @@ struct thread_struct {
> #endif
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #ifndef CONFIG_DEBUG_SPINLOCK
> #define INIT_THREAD { \
> @@ -75,7 +75,7 @@ struct thread_struct {
> }
> #endif /* !(CONFIG_DEBUG_SPINLOCK) */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <asm/fpumacro.h>
> @@ -242,6 +242,6 @@ static inline void prefetchw(const void *x)
>
> int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool illegal_insn_trap);
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__ASM_SPARC64_PROCESSOR_H) */
> diff --git a/arch/sparc/include/asm/psr.h b/arch/sparc/include/asm/psr.h
> index 65127ce565abc..5af50ccda0233 100644
> --- a/arch/sparc/include/asm/psr.h
> +++ b/arch/sparc/include/asm/psr.h
> @@ -14,7 +14,7 @@
> #include <uapi/asm/psr.h>
>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /* Get the %psr register. */
> static inline unsigned int get_psr(void)
> {
> @@ -63,6 +63,6 @@ static inline unsigned int get_fsr(void)
> return fsr;
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__LINUX_SPARC_PSR_H) */
> diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
> index d1419e6690274..8adf3fd2f00fe 100644
> --- a/arch/sparc/include/asm/ptrace.h
> +++ b/arch/sparc/include/asm/ptrace.h
> @@ -5,7 +5,7 @@
> #include <uapi/asm/ptrace.h>
>
> #if defined(__sparc__) && defined(__arch64__)
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/compiler.h>
> #include <linux/threads.h>
> @@ -113,10 +113,10 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
> {
> return regs->u_regs[UREG_I6];
> }
> -#else /* __ASSEMBLY__ */
> -#endif /* __ASSEMBLY__ */
> +#else /* __ASSEMBLER__ */
> +#endif /* __ASSEMBLER__ */
> #else /* (defined(__sparc__) && defined(__arch64__)) */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/switch_to.h>
>
> static inline bool pt_regs_is_syscall(struct pt_regs *regs)
> @@ -144,8 +144,8 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs)
> #define instruction_pointer(regs) ((regs)->pc)
> #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
> unsigned long profile_pc(struct pt_regs *);
> -#else /* (!__ASSEMBLY__) */
> -#endif /* (!__ASSEMBLY__) */
> +#else /* (!__ASSEMBLER__) */
> +#endif /* (!__ASSEMBLER__) */
> #endif /* (defined(__sparc__) && defined(__arch64__)) */
> #define STACK_BIAS 2047
>
> diff --git a/arch/sparc/include/asm/ross.h b/arch/sparc/include/asm/ross.h
> index 79a54d66a2c0b..53a42b37495d0 100644
> --- a/arch/sparc/include/asm/ross.h
> +++ b/arch/sparc/include/asm/ross.h
> @@ -95,7 +95,7 @@
> #define HYPERSPARC_ICCR_FTD 0x00000002
> #define HYPERSPARC_ICCR_ICE 0x00000001
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline unsigned int get_ross_icr(void)
> {
> @@ -187,6 +187,6 @@ static inline void hyper_flush_cache_page(unsigned long page)
> }
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(_SPARC_ROSS_H) */
> diff --git a/arch/sparc/include/asm/sbi.h b/arch/sparc/include/asm/sbi.h
> index 4d6026c1e446f..861f85b5bf9bb 100644
> --- a/arch/sparc/include/asm/sbi.h
> +++ b/arch/sparc/include/asm/sbi.h
> @@ -64,7 +64,7 @@ struct sbi_regs {
> */
>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline int acquire_sbi(int devid, int mask)
> {
> @@ -111,6 +111,6 @@ static inline void set_sbi_ctl(int devid, int cfgno, int cfg)
> "i" (ASI_M_CTL));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_SBI_H) */
> diff --git a/arch/sparc/include/asm/sigcontext.h b/arch/sparc/include/asm/sigcontext.h
> index ee05f9d2bcf2c..200f95144fd29 100644
> --- a/arch/sparc/include/asm/sigcontext.h
> +++ b/arch/sparc/include/asm/sigcontext.h
> @@ -5,7 +5,7 @@
> #include <asm/ptrace.h>
> #include <uapi/asm/sigcontext.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __SUNOS_MAXWIN 31
>
> @@ -104,6 +104,6 @@ typedef struct {
> #endif /* (CONFIG_SPARC64) */
>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC_SIGCONTEXT_H) */
> diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
> index 28f81081e37da..d93fe93544ec6 100644
> --- a/arch/sparc/include/asm/signal.h
> +++ b/arch/sparc/include/asm/signal.h
> @@ -2,16 +2,16 @@
> #ifndef __SPARC_SIGNAL_H
> #define __SPARC_SIGNAL_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/personality.h>
> #include <linux/types.h>
> #endif
> #include <uapi/asm/signal.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __ARCH_HAS_KA_RESTORER
> #define __ARCH_HAS_SA_RESTORER
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
> #endif /* !(__SPARC_SIGNAL_H) */
> diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h
> index 2cf7971d7f6c9..9c6ed98fbaf12 100644
> --- a/arch/sparc/include/asm/smp_32.h
> +++ b/arch/sparc/include/asm/smp_32.h
> @@ -10,15 +10,15 @@
> #include <linux/threads.h>
> #include <asm/head.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/cpumask.h>
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #ifdef CONFIG_SMP
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/asi.h>
> @@ -105,7 +105,7 @@ int hard_smp_processor_id(void);
>
> void smp_setup_cpu_possible_map(void);
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* Sparc specific messages. */
> #define MSG_CROSS_CALL 0x0005 /* run func on cpus */
> diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h
> index 0964fede0b2cc..759fb4a9530ed 100644
> --- a/arch/sparc/include/asm/smp_64.h
> +++ b/arch/sparc/include/asm/smp_64.h
> @@ -12,16 +12,16 @@
> #include <asm/starfire.h>
> #include <asm/spitfire.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/cpumask.h>
> #include <linux/cache.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #ifdef CONFIG_SMP
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * Private routines/data
> @@ -68,7 +68,7 @@ int __cpu_disable(void);
> void __cpu_die(unsigned int cpu);
> #endif
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #else
>
> diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
> index bc5aa6f616764..6d6d261bf8d2f 100644
> --- a/arch/sparc/include/asm/spinlock_32.h
> +++ b/arch/sparc/include/asm/spinlock_32.h
> @@ -7,7 +7,7 @@
> #ifndef __SPARC_SPINLOCK_H
> #define __SPARC_SPINLOCK_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/psr.h>
> #include <asm/barrier.h>
> @@ -183,6 +183,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)
> res; \
> })
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* __SPARC_SPINLOCK_H */
> diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
> index 3a9a0b0c74654..13cd15d346be4 100644
> --- a/arch/sparc/include/asm/spinlock_64.h
> +++ b/arch/sparc/include/asm/spinlock_64.h
> @@ -7,13 +7,13 @@
> #ifndef __SPARC64_SPINLOCK_H
> #define __SPARC64_SPINLOCK_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/processor.h>
> #include <asm/barrier.h>
> #include <asm/qspinlock.h>
> #include <asm/qrwlock.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC64_SPINLOCK_H) */
> diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
> index e9b7d25b29fae..79b9dd5e9ac68 100644
> --- a/arch/sparc/include/asm/spitfire.h
> +++ b/arch/sparc/include/asm/spitfire.h
> @@ -68,7 +68,7 @@
> #define CPU_ID_M8 ('8')
> #define CPU_ID_SONOMA1 ('N')
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> enum ultra_tlb_layout {
> spitfire = 0,
> @@ -363,6 +363,6 @@ static inline void cheetah_put_itlb_data(int entry, unsigned long data)
> "i" (ASI_ITLB_DATA_ACCESS));
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
> #endif /* CONFIG_SPARC64 */
> #endif /* !(_SPARC64_SPITFIRE_H) */
> diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h
> index fb1a8c499cb03..8e511ed787755 100644
> --- a/arch/sparc/include/asm/starfire.h
> +++ b/arch/sparc/include/asm/starfire.h
> @@ -8,7 +8,7 @@
> #ifndef _SPARC64_STARFIRE_H
> #define _SPARC64_STARFIRE_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern int this_is_starfire;
>
> diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
> index 45b4955b253f2..fdaf7b171e0ac 100644
> --- a/arch/sparc/include/asm/thread_info_32.h
> +++ b/arch/sparc/include/asm/thread_info_32.h
> @@ -14,7 +14,7 @@
>
> #ifdef __KERNEL__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/page.h>
> @@ -72,7 +72,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
> */
> #define THREAD_SIZE_ORDER 1
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /* Size of kernel stack for each process */
> #define THREAD_SIZE (2 * PAGE_SIZE)
> diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
> index 1a44372e2bc07..c8a73dff27f80 100644
> --- a/arch/sparc/include/asm/thread_info_64.h
> +++ b/arch/sparc/include/asm/thread_info_64.h
> @@ -26,7 +26,7 @@
>
> #include <asm/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/types.h>
> @@ -64,7 +64,7 @@ struct thread_info {
> __attribute__ ((aligned(64)));
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* offsets into the thread_info struct for assembly code access */
> #define TI_TASK 0x00000000
> @@ -110,7 +110,7 @@ struct thread_info {
> /*
> * macros/functions for gaining access to the thread information structure
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define INIT_THREAD_INFO(tsk) \
> { \
> @@ -150,7 +150,7 @@ extern struct thread_info *current_thread_info(void);
> #define set_thread_fpdepth(val) (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_FPDEPTH] = (val))
> #define get_thread_wsaved() (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED])
> #define set_thread_wsaved(val) (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED] = (val))
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /*
> * Thread information flags, only 16 bits are available as we encode
> @@ -228,14 +228,14 @@ extern struct thread_info *current_thread_info(void);
> * Note that there are only 8 bits available.
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0)
> #define test_thread_64bit_stack(__SP) \
> ((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \
> false : true)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* __KERNEL__ */
>
> diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
> index ace0d48e837e5..6cf2a60a0156d 100644
> --- a/arch/sparc/include/asm/trap_block.h
> +++ b/arch/sparc/include/asm/trap_block.h
> @@ -7,7 +7,7 @@
> #include <asm/hypervisor.h>
> #include <asm/asi.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* Trap handling code needs to get at a few critical values upon
> * trap entry and to process TSB misses. These cannot be in the
> @@ -91,7 +91,7 @@ extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,
> __sun_m7_2insn_patch_end;
>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #define TRAP_PER_CPU_THREAD 0x00
> #define TRAP_PER_CPU_PGD_PADDR 0x08
> diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h
> index 2fba2602ba69c..e4e10b0e7887d 100644
> --- a/arch/sparc/include/asm/traps.h
> +++ b/arch/sparc/include/asm/traps.h
> @@ -9,7 +9,7 @@
>
> #include <uapi/asm/traps.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /* This is for V8 compliant Sparc CPUS */
> struct tt_entry {
> unsigned long inst_one;
> @@ -21,5 +21,5 @@ struct tt_entry {
> /* We set this to _start in system setup. */
> extern struct tt_entry *sparc_ttable;
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
> #endif /* !(_SPARC_TRAPS_H) */
> diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
> index 522a677e050d7..239be259e1669 100644
> --- a/arch/sparc/include/asm/tsb.h
> +++ b/arch/sparc/include/asm/tsb.h
> @@ -59,7 +59,7 @@
> * The kernel TSB is locked into the TLB by virtue of being in the
> * kernel image, so we don't play these games for swapper_tsb access.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct tsb_ldquad_phys_patch_entry {
> unsigned int addr;
> unsigned int sun4u_insn;
> diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h
> index 8f64694080198..b32d3068cce12 100644
> --- a/arch/sparc/include/asm/ttable.h
> +++ b/arch/sparc/include/asm/ttable.h
> @@ -5,7 +5,7 @@
> #include <asm/utrap.h>
> #include <asm/pil.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
> #include <asm/thread_info.h>
> #endif
>
> diff --git a/arch/sparc/include/asm/turbosparc.h b/arch/sparc/include/asm/turbosparc.h
> index 23df777f9cea5..5f73263b6ded8 100644
> --- a/arch/sparc/include/asm/turbosparc.h
> +++ b/arch/sparc/include/asm/turbosparc.h
> @@ -57,7 +57,7 @@
> #define TURBOSPARC_WTENABLE 0x00000020 /* Write thru for dcache */
> #define TURBOSPARC_SNENABLE 0x40000000 /* DVMA snoop enable */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* Bits [13:5] select one of 512 instruction cache tags */
> static inline void turbosparc_inv_insn_tag(unsigned long addr)
> @@ -121,6 +121,6 @@ static inline unsigned long turbosparc_get_ccreg(void)
> return regval;
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_TURBOSPARC_H) */
> diff --git a/arch/sparc/include/asm/upa.h b/arch/sparc/include/asm/upa.h
> index 782691b30f545..b1df3a7f40ed0 100644
> --- a/arch/sparc/include/asm/upa.h
> +++ b/arch/sparc/include/asm/upa.h
> @@ -24,7 +24,7 @@
> #define UPA_PORTID_ID 0x000000000000ffff /* Module Identification bits */
>
> /* UPA I/O space accessors */
> -#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
> +#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
> static inline unsigned char _upa_readb(unsigned long addr)
> {
> unsigned char ret;
> @@ -105,6 +105,6 @@ static inline void _upa_writeq(unsigned long q, unsigned long addr)
> #define upa_writew(__w, __addr) (_upa_writew((__w), (unsigned long)(__addr)))
> #define upa_writel(__l, __addr) (_upa_writel((__l), (unsigned long)(__addr)))
> #define upa_writeq(__q, __addr) (_upa_writeq((__q), (unsigned long)(__addr)))
> -#endif /* __KERNEL__ && !__ASSEMBLY__ */
> +#endif /* __KERNEL__ && !__ASSEMBLER__ */
>
> #endif /* !(_SPARC64_UPA_H) */
> diff --git a/arch/sparc/include/asm/vaddrs.h b/arch/sparc/include/asm/vaddrs.h
> index 4fec0341e2a81..da567600c8974 100644
> --- a/arch/sparc/include/asm/vaddrs.h
> +++ b/arch/sparc/include/asm/vaddrs.h
> @@ -31,7 +31,7 @@
> */
> #define SRMMU_NOCACHE_ALCRATIO 64 /* 256 pages per 64MB of system RAM */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/kmap_size.h>
>
> enum fixed_addresses {
> diff --git a/arch/sparc/include/asm/viking.h b/arch/sparc/include/asm/viking.h
> index 08ffc605035f3..bbb714de43c42 100644
> --- a/arch/sparc/include/asm/viking.h
> +++ b/arch/sparc/include/asm/viking.h
> @@ -110,7 +110,7 @@
> #define VIKING_PTAG_DIRTY 0x00010000 /* Block has been modified */
> #define VIKING_PTAG_SHARED 0x00000100 /* Shared with some other cache */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline void viking_flush_icache(void)
> {
> @@ -250,6 +250,6 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr)
> return val;
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_VIKING_H) */
> diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h
> index 7903e84e09e05..71eb4e9afb3e0 100644
> --- a/arch/sparc/include/asm/visasm.h
> +++ b/arch/sparc/include/asm/visasm.h
> @@ -45,7 +45,7 @@
> #define VISExitHalfFast \
> wr %o5, 0, %fprs;
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> static inline void save_and_clear_fpu(void) {
> __asm__ __volatile__ (
> " rd %%fprs, %%o5\n"
> diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h
> index 9a870f5dc3712..7612f15a261fe 100644
> --- a/drivers/char/hw_random/n2rng.h
> +++ b/drivers/char/hw_random/n2rng.h
> @@ -48,7 +48,7 @@
>
> #define HV_RNG_NUM_CONTROL 4
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long sun4v_rng_get_diag_ctl(void);
> extern unsigned long sun4v_rng_ctl_read_v1(unsigned long ctl_regs_ra,
> unsigned long *state,
> @@ -147,6 +147,6 @@ struct n2rng {
> #define N2RNG_BUSY_LIMIT 100
> #define N2RNG_HCHECK_LIMIT 100
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* _N2RNG_H */
Friendly ping!
David, Andreas, could you maybe pick this (and the previous patch) up via
your sparc 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
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-06-06 7:22 ` Thomas Huth
@ 2025-07-30 7:12 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-07-30 7:12 UTC (permalink / raw)
To: David S. Miller, Andreas Larsson; +Cc: sparclinux
On 06/06/2025 09.22, Thomas Huth wrote:
> 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: "David S. Miller" <davem@davemloft.net>
>> Cc: Andreas Larsson <andreas@gaisler.com>
>> Cc: sparclinux@vger.kernel.org
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> arch/sparc/include/asm/adi_64.h | 4 +-
>> arch/sparc/include/asm/auxio.h | 4 +-
>> arch/sparc/include/asm/auxio_32.h | 4 +-
>> arch/sparc/include/asm/auxio_64.h | 4 +-
>> arch/sparc/include/asm/cacheflush_64.h | 4 +-
>> arch/sparc/include/asm/cpudata.h | 4 +-
>> arch/sparc/include/asm/cpudata_64.h | 4 +-
>> arch/sparc/include/asm/delay_64.h | 4 +-
>> arch/sparc/include/asm/ftrace.h | 2 +-
>> arch/sparc/include/asm/hvtramp.h | 2 +-
>> arch/sparc/include/asm/hypervisor.h | 92 ++++++++++++-------------
>> arch/sparc/include/asm/irqflags_32.h | 4 +-
>> arch/sparc/include/asm/irqflags_64.h | 4 +-
>> arch/sparc/include/asm/jump_label.h | 4 +-
>> arch/sparc/include/asm/kdebug_32.h | 4 +-
>> arch/sparc/include/asm/leon.h | 8 +--
>> arch/sparc/include/asm/leon_amba.h | 6 +-
>> arch/sparc/include/asm/mman.h | 4 +-
>> arch/sparc/include/asm/mmu_64.h | 4 +-
>> arch/sparc/include/asm/mmu_context_32.h | 4 +-
>> arch/sparc/include/asm/mmu_context_64.h | 4 +-
>> arch/sparc/include/asm/mxcc.h | 4 +-
>> arch/sparc/include/asm/obio.h | 4 +-
>> arch/sparc/include/asm/openprom.h | 4 +-
>> arch/sparc/include/asm/page_32.h | 8 +--
>> arch/sparc/include/asm/page_64.h | 8 +--
>> arch/sparc/include/asm/pcic.h | 2 +-
>> arch/sparc/include/asm/pgtable_32.h | 4 +-
>> arch/sparc/include/asm/pgtable_64.h | 8 +--
>> arch/sparc/include/asm/pgtsrmmu.h | 6 +-
>> arch/sparc/include/asm/processor_64.h | 10 +--
>> arch/sparc/include/asm/psr.h | 4 +-
>> arch/sparc/include/asm/ptrace.h | 12 ++--
>> arch/sparc/include/asm/ross.h | 4 +-
>> arch/sparc/include/asm/sbi.h | 4 +-
>> arch/sparc/include/asm/sigcontext.h | 4 +-
>> arch/sparc/include/asm/signal.h | 6 +-
>> arch/sparc/include/asm/smp_32.h | 8 +--
>> arch/sparc/include/asm/smp_64.h | 8 +--
>> arch/sparc/include/asm/spinlock_32.h | 4 +-
>> arch/sparc/include/asm/spinlock_64.h | 4 +-
>> arch/sparc/include/asm/spitfire.h | 4 +-
>> arch/sparc/include/asm/starfire.h | 2 +-
>> arch/sparc/include/asm/thread_info_32.h | 4 +-
>> arch/sparc/include/asm/thread_info_64.h | 12 ++--
>> arch/sparc/include/asm/trap_block.h | 4 +-
>> arch/sparc/include/asm/traps.h | 4 +-
>> arch/sparc/include/asm/tsb.h | 2 +-
>> arch/sparc/include/asm/ttable.h | 2 +-
>> arch/sparc/include/asm/turbosparc.h | 4 +-
>> arch/sparc/include/asm/upa.h | 4 +-
>> arch/sparc/include/asm/vaddrs.h | 2 +-
>> arch/sparc/include/asm/viking.h | 4 +-
>> arch/sparc/include/asm/visasm.h | 2 +-
>> drivers/char/hw_random/n2rng.h | 4 +-
>> 55 files changed, 172 insertions(+), 172 deletions(-)
>>
>> diff --git a/arch/sparc/include/asm/adi_64.h b/arch/sparc/include/asm/
>> adi_64.h
>> index 4301c6fd87f7a..0c066fdab6963 100644
>> --- a/arch/sparc/include/asm/adi_64.h
>> +++ b/arch/sparc/include/asm/adi_64.h
>> @@ -9,7 +9,7 @@
>> #include <linux/types.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct adi_caps {
>> __u64 blksz;
>> @@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void)
>> return adi_state.caps.nbits;
>> }
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> #endif /* !(__ASM_SPARC64_ADI_H) */
>> diff --git a/arch/sparc/include/asm/auxio.h b/arch/sparc/include/asm/auxio.h
>> index a2681052e9000..d0a933ed0d04b 100644
>> --- a/arch/sparc/include/asm/auxio.h
>> +++ b/arch/sparc/include/asm/auxio.h
>> @@ -2,11 +2,11 @@
>> #ifndef ___ASM_SPARC_AUXIO_H
>> #define ___ASM_SPARC_AUXIO_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern void __iomem *auxio_register;
>> -#endif /* ifndef __ASSEMBLY__ */
>> +#endif /* ifndef __ASSEMBLER__ */
>> #if defined(__sparc__) && defined(__arch64__)
>> #include <asm/auxio_64.h>
>> diff --git a/arch/sparc/include/asm/auxio_32.h b/arch/sparc/include/asm/
>> auxio_32.h
>> index 852457c7a265a..db58fa28de9ec 100644
>> --- a/arch/sparc/include/asm/auxio_32.h
>> +++ b/arch/sparc/include/asm/auxio_32.h
>> @@ -29,7 +29,7 @@
>> #define AUXIO_FLPY_EJCT 0x02 /* Eject floppy disk. Write only. */
>> #define AUXIO_LED 0x01 /* On if set, off if unset. Read/Write */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /*
>> * NOTE: these routines are implementation dependent--
>> @@ -75,7 +75,7 @@ do { \
>> } \
>> } while (0)
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /* AUXIO2 (Power Off Control) */
>> diff --git a/arch/sparc/include/asm/auxio_64.h b/arch/sparc/include/asm/
>> auxio_64.h
>> index ae1ed41987db7..8a4ae07daf168 100644
>> --- a/arch/sparc/include/asm/auxio_64.h
>> +++ b/arch/sparc/include/asm/auxio_64.h
>> @@ -74,7 +74,7 @@
>> #define AUXIO_PCIO_CPWR_OFF 0x02 /* Courtesy Power Off */
>> #define AUXIO_PCIO_SPWR_OFF 0x01 /* System Power Off */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define AUXIO_LTE_ON 1
>> #define AUXIO_LTE_OFF 0
>> @@ -94,6 +94,6 @@ void auxio_set_lte(int on);
>> */
>> void auxio_set_led(int on);
>> -#endif /* ifndef __ASSEMBLY__ */
>> +#endif /* ifndef __ASSEMBLER__ */
>> #endif /* !(_SPARC64_AUXIO_H) */
>> diff --git a/arch/sparc/include/asm/cacheflush_64.h b/arch/sparc/include/
>> asm/cacheflush_64.h
>> index 2b1261b77ecd1..06092572c0455 100644
>> --- a/arch/sparc/include/asm/cacheflush_64.h
>> +++ b/arch/sparc/include/asm/cacheflush_64.h
>> @@ -4,7 +4,7 @@
>> #include <asm/page.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/mm.h>
>> @@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct
>> page *,
>> #define flush_cache_vmap_early(start, end) do { } while (0)
>> #define flush_cache_vunmap(start, end) do { } while (0)
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* _SPARC64_CACHEFLUSH_H */
>> diff --git a/arch/sparc/include/asm/cpudata.h b/arch/sparc/include/asm/
>> cpudata.h
>> index d213165ee713b..67022a153023f 100644
>> --- a/arch/sparc/include/asm/cpudata.h
>> +++ b/arch/sparc/include/asm/cpudata.h
>> @@ -2,14 +2,14 @@
>> #ifndef ___ASM_SPARC_CPUDATA_H
>> #define ___ASM_SPARC_CPUDATA_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/threads.h>
>> #include <linux/percpu.h>
>> extern const struct seq_operations cpuinfo_op;
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #if defined(__sparc__) && defined(__arch64__)
>> #include <asm/cpudata_64.h>
>> diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/
>> cpudata_64.h
>> index 9c3fc03abe9ae..056b3c0e7ef94 100644
>> --- a/arch/sparc/include/asm/cpudata_64.h
>> +++ b/arch/sparc/include/asm/cpudata_64.h
>> @@ -7,7 +7,7 @@
>> #ifndef _SPARC64_CPUDATA_H
>> #define _SPARC64_CPUDATA_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> typedef struct {
>> /* Dcache line 1 */
>> @@ -35,7 +35,7 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
>> #define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
>> #define local_cpu_data() (*this_cpu_ptr(&__cpu_data))
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #include <asm/trap_block.h>
>> diff --git a/arch/sparc/include/asm/delay_64.h b/arch/sparc/include/asm/
>> delay_64.h
>> index 22213b1c119d2..5de5b5f23188c 100644
>> --- a/arch/sparc/include/asm/delay_64.h
>> +++ b/arch/sparc/include/asm/delay_64.h
>> @@ -7,12 +7,12 @@
>> #ifndef _SPARC64_DELAY_H
>> #define _SPARC64_DELAY_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> void __delay(unsigned long loops);
>> void udelay(unsigned long usecs);
>> #define mdelay(n) udelay((n) * 1000)
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* _SPARC64_DELAY_H */
>> diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/
>> ftrace.h
>> index e284394cb3aa2..f7c9036199c5e 100644
>> --- a/arch/sparc/include/asm/ftrace.h
>> +++ b/arch/sparc/include/asm/ftrace.h
>> @@ -6,7 +6,7 @@
>> #define MCOUNT_ADDR ((unsigned long)(_mcount))
>> #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> void _mcount(void);
>> #endif
>> diff --git a/arch/sparc/include/asm/hvtramp.h b/arch/sparc/include/asm/
>> hvtramp.h
>> index ce2453ea4f2be..8cf7a54fa528a 100644
>> --- a/arch/sparc/include/asm/hvtramp.h
>> +++ b/arch/sparc/include/asm/hvtramp.h
>> @@ -2,7 +2,7 @@
>> #ifndef _SPARC64_HVTRAP_H
>> #define _SPARC64_HVTRAP_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/types.h>
>> diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/
>> hypervisor.h
>> index f220edcf17c7c..94ac56d43746b 100644
>> --- a/arch/sparc/include/asm/hypervisor.h
>> +++ b/arch/sparc/include/asm/hypervisor.h
>> @@ -102,7 +102,7 @@
>> */
>> #define HV_FAST_MACH_EXIT 0x00
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> void sun4v_mach_exit(unsigned long exit_code);
>> #endif
>> @@ -131,7 +131,7 @@ void sun4v_mach_exit(unsigned long exit_code);
>> */
>> #define HV_FAST_MACH_DESC 0x01
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_mach_desc(unsigned long buffer_pa,
>> unsigned long buf_len,
>> unsigned long *real_buf_len);
>> @@ -152,7 +152,7 @@ unsigned long sun4v_mach_desc(unsigned long buffer_pa,
>> */
>> #define HV_FAST_MACH_SIR 0x02
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> void sun4v_mach_sir(void);
>> #endif
>> @@ -208,7 +208,7 @@ void sun4v_mach_sir(void);
>> */
>> #define HV_FAST_MACH_SET_WATCHDOG 0x05
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
>> unsigned long *orig_timeout);
>> #endif
>> @@ -254,7 +254,7 @@ unsigned long sun4v_mach_set_watchdog(unsigned long
>> timeout,
>> */
>> #define HV_FAST_CPU_START 0x10
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_cpu_start(unsigned long cpuid,
>> unsigned long pc,
>> unsigned long rtba,
>> @@ -282,7 +282,7 @@ unsigned long sun4v_cpu_start(unsigned long cpuid,
>> */
>> #define HV_FAST_CPU_STOP 0x11
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_cpu_stop(unsigned long cpuid);
>> #endif
>> @@ -299,7 +299,7 @@ unsigned long sun4v_cpu_stop(unsigned long cpuid);
>> */
>> #define HV_FAST_CPU_YIELD 0x12
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_cpu_yield(void);
>> #endif
>> @@ -317,7 +317,7 @@ unsigned long sun4v_cpu_yield(void);
>> */
>> #define HV_FAST_CPU_POKE 0x13
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_cpu_poke(unsigned long cpuid);
>> #endif
>> @@ -363,7 +363,7 @@ unsigned long sun4v_cpu_poke(unsigned long cpuid);
>> #define HV_CPU_QUEUE_RES_ERROR 0x3e
>> #define HV_CPU_QUEUE_NONRES_ERROR 0x3f
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_cpu_qconf(unsigned long type,
>> unsigned long queue_paddr,
>> unsigned long num_queue_entries);
>> @@ -416,7 +416,7 @@ unsigned long sun4v_cpu_qconf(unsigned long type,
>> */
>> #define HV_FAST_CPU_MONDO_SEND 0x42
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
>> unsigned long cpu_list_pa,
>> unsigned long mondo_block_pa);
>> @@ -449,7 +449,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long
>> cpu_count,
>> #define HV_CPU_STATE_RUNNING 0x02
>> #define HV_CPU_STATE_ERROR 0x03
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> long sun4v_cpu_state(unsigned long cpuid);
>> #endif
>> @@ -485,7 +485,7 @@ long sun4v_cpu_state(unsigned long cpuid);
>> *
>> * Layout of a TSB description for mmu_tsb_ctx{,non}0() calls.
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct hv_tsb_descr {
>> unsigned short pgsz_idx;
>> unsigned short assoc;
>> @@ -536,7 +536,7 @@ struct hv_tsb_descr {
>> * The fault status block is a multiple of 64-bytes and must be aligned
>> * on a 64-byte boundary.
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct hv_fault_status {
>> unsigned long i_fault_type;
>> unsigned long i_fault_addr;
>> @@ -651,7 +651,7 @@ struct hv_fault_status {
>> */
>> #define HV_FAST_MMU_TSB_CTX0 0x20
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
>> unsigned long tsb_desc_ra);
>> #endif
>> @@ -736,7 +736,7 @@ unsigned long sun4v_mmu_tsb_ctx0(unsigned long
>> num_descriptions,
>> */
>> #define HV_FAST_MMU_DEMAP_ALL 0x24
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> void sun4v_mmu_demap_all(void);
>> #endif
>> @@ -766,7 +766,7 @@ void sun4v_mmu_demap_all(void);
>> */
>> #define HV_FAST_MMU_MAP_PERM_ADDR 0x25
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
>> unsigned long set_to_zero,
>> unsigned long tte,
>> @@ -990,7 +990,7 @@ unsigned long sun4v_mmu_map_perm_addr(unsigned long
>> vaddr,
>> */
>> #define HV_CCB_SUBMIT 0x34
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
>> unsigned long len,
>> unsigned long flags,
>> @@ -1035,7 +1035,7 @@ unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
>> */
>> #define HV_CCB_INFO 0x35
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_ccb_info(unsigned long ca,
>> void *info_arr);
>> #endif
>> @@ -1069,7 +1069,7 @@ unsigned long sun4v_ccb_info(unsigned long ca,
>> */
>> #define HV_CCB_KILL 0x36
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_ccb_kill(unsigned long ca,
>> void *kill_status);
>> #endif
>> @@ -1104,7 +1104,7 @@ unsigned long sun4v_ccb_kill(unsigned long ca,
>> */
>> #define HV_FAST_TOD_GET 0x50
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_tod_get(unsigned long *time);
>> #endif
>> @@ -1121,7 +1121,7 @@ unsigned long sun4v_tod_get(unsigned long *time);
>> */
>> #define HV_FAST_TOD_SET 0x51
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_tod_set(unsigned long time);
>> #endif
>> @@ -1197,7 +1197,7 @@ unsigned long sun4v_tod_set(unsigned long time);
>> */
>> #define HV_FAST_CONS_WRITE 0x63
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> long sun4v_con_getchar(long *status);
>> long sun4v_con_putchar(long c);
>> long sun4v_con_read(unsigned long buffer,
>> @@ -1239,7 +1239,7 @@ unsigned long sun4v_con_write(unsigned long buffer,
>> #define HV_SOFT_STATE_NORMAL 0x01
>> #define HV_SOFT_STATE_TRANSITION 0x02
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
>> unsigned long msg_string_ra);
>> #endif
>> @@ -1318,7 +1318,7 @@ unsigned long sun4v_mach_set_soft_state(unsigned
>> long soft_state,
>> */
>> #define HV_FAST_SVC_CLRSTATUS 0x84
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_svc_send(unsigned long svc_id,
>> unsigned long buffer,
>> unsigned long buffer_size,
>> @@ -1348,7 +1348,7 @@ unsigned long sun4v_svc_clrstatus(unsigned long svc_id,
>> * start (offset 0) of the trap trace buffer, and is described as
>> * follows:
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct hv_trap_trace_control {
>> unsigned long head_offset;
>> unsigned long tail_offset;
>> @@ -1367,7 +1367,7 @@ struct hv_trap_trace_control {
>> *
>> * Each trap trace buffer entry is laid out as follows:
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct hv_trap_trace_entry {
>> unsigned char type; /* Hypervisor or guest entry? */
>> unsigned char hpstate; /* Hyper-privileged state */
>> @@ -1617,7 +1617,7 @@ struct hv_trap_trace_entry {
>> */
>> #define HV_FAST_INTR_DEVINO2SYSINO 0xa0
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
>> unsigned long devino);
>> #endif
>> @@ -1635,7 +1635,7 @@ unsigned long sun4v_devino_to_sysino(unsigned long
>> devhandle,
>> */
>> #define HV_FAST_INTR_GETENABLED 0xa1
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_intr_getenabled(unsigned long sysino);
>> #endif
>> @@ -1651,7 +1651,7 @@ unsigned long sun4v_intr_getenabled(unsigned long
>> sysino);
>> */
>> #define HV_FAST_INTR_SETENABLED 0xa2
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_intr_setenabled(unsigned long sysino,
>> unsigned long intr_enabled);
>> #endif
>> @@ -1668,7 +1668,7 @@ unsigned long sun4v_intr_setenabled(unsigned long
>> sysino,
>> */
>> #define HV_FAST_INTR_GETSTATE 0xa3
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_intr_getstate(unsigned long sysino);
>> #endif
>> @@ -1688,7 +1688,7 @@ unsigned long sun4v_intr_getstate(unsigned long
>> sysino);
>> */
>> #define HV_FAST_INTR_SETSTATE 0xa4
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long
>> intr_state);
>> #endif
>> @@ -1706,7 +1706,7 @@ unsigned long sun4v_intr_setstate(unsigned long
>> sysino, unsigned long intr_state
>> */
>> #define HV_FAST_INTR_GETTARGET 0xa5
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_intr_gettarget(unsigned long sysino);
>> #endif
>> @@ -1723,7 +1723,7 @@ unsigned long sun4v_intr_gettarget(unsigned long
>> sysino);
>> */
>> #define HV_FAST_INTR_SETTARGET 0xa6
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long
>> cpuid);
>> #endif
>> @@ -1807,7 +1807,7 @@ unsigned long sun4v_intr_settarget(unsigned long
>> sysino, unsigned long cpuid);
>> */
>> #define HV_FAST_VINTR_SET_TARGET 0xae
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_vintr_get_cookie(unsigned long dev_handle,
>> unsigned long dev_ino,
>> unsigned long *cookie);
>> @@ -3047,7 +3047,7 @@ unsigned long sun4v_vintr_set_target(unsigned long
>> dev_handle,
>> #define LDC_MTE_SZ64K 0x0000000000000001 /* 64K page */
>> #define LDC_MTE_SZ8K 0x0000000000000000 /* 8K page */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct ldc_mtable_entry {
>> unsigned long mte;
>> unsigned long cookie;
>> @@ -3130,7 +3130,7 @@ struct ldc_mtable_entry {
>> */
>> #define HV_FAST_LDC_REVOKE 0xef
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_ldc_tx_qconf(unsigned long channel,
>> unsigned long ra,
>> unsigned long num_entries);
>> @@ -3230,7 +3230,7 @@ unsigned long sun4v_ldc_revoke(unsigned long channel,
>> #define HV_FAST_N2_GET_PERFREG 0x104
>> #define HV_FAST_N2_SET_PERFREG 0x105
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_niagara_getperf(unsigned long reg,
>> unsigned long *val);
>> unsigned long sun4v_niagara_setperf(unsigned long reg,
>> @@ -3247,7 +3247,7 @@ unsigned long sun4v_niagara2_setperf(unsigned long reg,
>> * a buffer where these statistics can be collected. It is continually
>> * updated once configured. The layout is as follows:
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct hv_mmu_statistics {
>> unsigned long immu_tsb_hits_ctx0_8k_tte;
>> unsigned long immu_tsb_ticks_ctx0_8k_tte;
>> @@ -3332,7 +3332,7 @@ struct hv_mmu_statistics {
>> */
>> #define HV_FAST_MMUSTAT_INFO 0x103
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_mmustat_conf(unsigned long ra, unsigned long *orig_ra);
>> unsigned long sun4v_mmustat_info(unsigned long *ra);
>> #endif
>> @@ -3343,7 +3343,7 @@ unsigned long sun4v_mmustat_info(unsigned long *ra);
>> #define HV_NCS_QCONF 0x01
>> #define HV_NCS_QTAIL_UPDATE 0x02
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct hv_ncs_queue_entry {
>> /* MAU Control Register */
>> unsigned long mau_control;
>> @@ -3422,7 +3422,7 @@ struct hv_ncs_qtail_update_arg {
>> */
>> #define HV_FAST_NCS_REQUEST 0x110
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_ncs_request(unsigned long request,
>> unsigned long arg_ra,
>> unsigned long arg_size);
>> @@ -3433,7 +3433,7 @@ unsigned long sun4v_ncs_request(unsigned long request,
>> #define HV_FAST_REBOOT_DATA_SET 0x172
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_reboot_data_set(unsigned long ra,
>> unsigned long len);
>> #endif
>> @@ -3441,7 +3441,7 @@ unsigned long sun4v_reboot_data_set(unsigned long ra,
>> #define HV_FAST_VT_GET_PERFREG 0x184
>> #define HV_FAST_VT_SET_PERFREG 0x185
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_vt_get_perfreg(unsigned long reg_num,
>> unsigned long *reg_val);
>> unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
>> @@ -3451,7 +3451,7 @@ unsigned long sun4v_vt_set_perfreg(unsigned long
>> reg_num,
>> #define HV_FAST_T5_GET_PERFREG 0x1a8
>> #define HV_FAST_T5_SET_PERFREG 0x1a9
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_t5_get_perfreg(unsigned long reg_num,
>> unsigned long *reg_val);
>> unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
>> @@ -3462,7 +3462,7 @@ unsigned long sun4v_t5_set_perfreg(unsigned long
>> reg_num,
>> #define HV_FAST_M7_GET_PERFREG 0x43
>> #define HV_FAST_M7_SET_PERFREG 0x44
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_m7_get_perfreg(unsigned long reg_num,
>> unsigned long *reg_val);
>> unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
>> @@ -3506,7 +3506,7 @@ unsigned long sun4v_m7_set_perfreg(unsigned long
>> reg_num,
>> #define HV_GRP_T5_CPU 0x0211
>> #define HV_GRP_DIAG 0x0300
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> unsigned long sun4v_get_version(unsigned long group,
>> unsigned long *major,
>> unsigned long *minor);
>> diff --git a/arch/sparc/include/asm/irqflags_32.h b/arch/sparc/include/
>> asm/irqflags_32.h
>> index 7ca3eaf3dace9..f5f20774faac1 100644
>> --- a/arch/sparc/include/asm/irqflags_32.h
>> +++ b/arch/sparc/include/asm/irqflags_32.h
>> @@ -11,7 +11,7 @@
>> #ifndef _ASM_IRQFLAGS_H
>> #define _ASM_IRQFLAGS_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/types.h>
>> #include <asm/psr.h>
>> @@ -43,6 +43,6 @@ static inline notrace bool arch_irqs_disabled(void)
>> return arch_irqs_disabled_flags(arch_local_save_flags());
>> }
>> -#endif /* (__ASSEMBLY__) */
>> +#endif /* (__ASSEMBLER__) */
>> #endif /* !(_ASM_IRQFLAGS_H) */
>> diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/
>> asm/irqflags_64.h
>> index c29ed571ae49e..0071566c2c223 100644
>> --- a/arch/sparc/include/asm/irqflags_64.h
>> +++ b/arch/sparc/include/asm/irqflags_64.h
>> @@ -13,7 +13,7 @@
>> #include <asm/pil.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline notrace unsigned long arch_local_save_flags(void)
>> {
>> @@ -93,6 +93,6 @@ static inline notrace unsigned long
>> arch_local_irq_save(void)
>> return flags;
>> }
>> -#endif /* (__ASSEMBLY__) */
>> +#endif /* (__ASSEMBLER__) */
>> #endif /* !(_ASM_IRQFLAGS_H) */
>> diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/
>> jump_label.h
>> index 2718cbea826a7..f49d1e6104e11 100644
>> --- a/arch/sparc/include/asm/jump_label.h
>> +++ b/arch/sparc/include/asm/jump_label.h
>> @@ -2,7 +2,7 @@
>> #ifndef _ASM_SPARC_JUMP_LABEL_H
>> #define _ASM_SPARC_JUMP_LABEL_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/types.h>
>> @@ -48,5 +48,5 @@ struct jump_entry {
>> jump_label_t key;
>> };
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> #endif
>> diff --git a/arch/sparc/include/asm/kdebug_32.h b/arch/sparc/include/asm/
>> kdebug_32.h
>> index 763d423823bdd..7627701a032cf 100644
>> --- a/arch/sparc/include/asm/kdebug_32.h
>> +++ b/arch/sparc/include/asm/kdebug_32.h
>> @@ -19,7 +19,7 @@
>> #define DEBUG_BP_TRAP 126
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* The debug vector is passed in %o1 at boot time. It is a pointer to
>> * a structure in the debuggers address space. Here is its format.
>> */
>> @@ -64,7 +64,7 @@ enum die_val {
>> DIE_OOPS,
>> };
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /* Some nice offset defines for assembler code. */
>> #define KDEBUG_ENTRY_OFF 0x0
>> diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
>> index c1e05e4ab9e35..053a24b67aeda 100644
>> --- a/arch/sparc/include/asm/leon.h
>> +++ b/arch/sparc/include/asm/leon.h
>> @@ -59,7 +59,7 @@
>> #define ASI_LEON3_SYSCTRL_CFG_SNOOPING (1 << 27)
>> #define ASI_LEON3_SYSCTRL_CFG_SSIZE(c) (1 << ((c >> 20) & 0xf))
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* do a physical address bypass write, i.e. for 0x80000000 */
>> static inline void leon_store_reg(unsigned long paddr, unsigned long value)
>> @@ -132,7 +132,7 @@ static inline int sparc_leon3_cpuid(void)
>> return sparc_leon3_asr17() >> 28;
>> }
>> -#endif /*!__ASSEMBLY__*/
>> +#endif /*!__ASSEMBLER__*/
>> #ifdef CONFIG_SMP
>> # define LEON3_IRQ_IPI_DEFAULT 13
>> @@ -194,7 +194,7 @@ static inline int sparc_leon3_cpuid(void)
>> #define LEON2_CCR_DSETS_MASK 0x03000000UL
>> #define LEON2_CFG_SSIZE_MASK 0x00007000UL
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct vm_area_struct;
>> unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);
>> @@ -247,7 +247,7 @@ extern int leon_ipi_irq;
>> #endif /* CONFIG_SMP */
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> /* macros used in leon_mm.c */
>> #define PFN(x) ((x) >> PAGE_SHIFT)
>> diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/
>> leon_amba.h
>> index 6433a93f51264..2ff5714d7a63a 100644
>> --- a/arch/sparc/include/asm/leon_amba.h
>> +++ b/arch/sparc/include/asm/leon_amba.h
>> @@ -8,7 +8,7 @@
>> #ifndef LEON_AMBA_H_INCLUDE
>> #define LEON_AMBA_H_INCLUDE
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct amba_prom_registers {
>> unsigned int phys_addr; /* The physical address of this register */
>> @@ -89,7 +89,7 @@ struct amba_prom_registers {
>> #define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7)
>> #define LEON3_GPTIMER_CTRL_ISPENDING(r)
>> (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0)
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct leon3_irqctrl_regs_map {
>> u32 ilevel;
>> @@ -189,7 +189,7 @@ extern int leon_debug_irqout;
>> extern unsigned long leon3_gptimer_irq;
>> extern unsigned int sparc_leon_eirq;
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> #define LEON3_IO_AREA 0xfff00000
>> #define LEON3_CONF_AREA 0xff000
>> diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h
>> index af9c10c83dc58..0ae05fbdc023e 100644
>> --- a/arch/sparc/include/asm/mman.h
>> +++ b/arch/sparc/include/asm/mman.h
>> @@ -4,7 +4,7 @@
>> #include <uapi/asm/mman.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len)
>> int sparc_mmap_check(unsigned long addr, unsigned long len);
>> @@ -87,5 +87,5 @@ static inline bool arch_validate_flags(unsigned long
>> vm_flags)
>> }
>> #endif /* CONFIG_SPARC64 */
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> #endif /* __SPARC_MMAN_H__ */
>> diff --git a/arch/sparc/include/asm/mmu_64.h b/arch/sparc/include/asm/
>> mmu_64.h
>> index 7e2704c770e9f..4eeb938f3e61c 100644
>> --- a/arch/sparc/include/asm/mmu_64.h
>> +++ b/arch/sparc/include/asm/mmu_64.h
>> @@ -59,7 +59,7 @@
>> #define CTX_HWBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_HW_MASK)
>> #define CTX_NRBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_NR_MASK)
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define TSB_ENTRY_ALIGNMENT 16
>> @@ -117,7 +117,7 @@ typedef struct {
>> spinlock_t tag_lock;
>> } mm_context_t;
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #define TSB_CONFIG_TSB 0x00
>> #define TSB_CONFIG_RSS_LIMIT 0x08
>> diff --git a/arch/sparc/include/asm/mmu_context_32.h b/arch/sparc/include/
>> asm/mmu_context_32.h
>> index 509043f815602..d9ff73f776f93 100644
>> --- a/arch/sparc/include/asm/mmu_context_32.h
>> +++ b/arch/sparc/include/asm/mmu_context_32.h
>> @@ -2,7 +2,7 @@
>> #ifndef __SPARC_MMU_CONTEXT_H
>> #define __SPARC_MMU_CONTEXT_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm-generic/mm_hooks.h>
>> @@ -29,6 +29,6 @@ void switch_mm(struct mm_struct *old_mm, struct
>> mm_struct *mm,
>> #include <asm-generic/mmu_context.h>
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__SPARC_MMU_CONTEXT_H) */
>> diff --git a/arch/sparc/include/asm/mmu_context_64.h b/arch/sparc/include/
>> asm/mmu_context_64.h
>> index 08160bf9a0f41..78bbacc14d2d9 100644
>> --- a/arch/sparc/include/asm/mmu_context_64.h
>> +++ b/arch/sparc/include/asm/mmu_context_64.h
>> @@ -4,7 +4,7 @@
>> /* Derived heavily from Linus's Alpha/AXP ASN code... */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/spinlock.h>
>> #include <linux/mm_types.h>
>> @@ -193,6 +193,6 @@ static inline unsigned long mm_untag_mask(struct
>> mm_struct *mm)
>> #include <asm-generic/mmu_context.h>
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__SPARC64_MMU_CONTEXT_H) */
>> diff --git a/arch/sparc/include/asm/mxcc.h b/arch/sparc/include/asm/mxcc.h
>> index 3a2561bea4dd4..bd6339dcf693d 100644
>> --- a/arch/sparc/include/asm/mxcc.h
>> +++ b/arch/sparc/include/asm/mxcc.h
>> @@ -84,7 +84,7 @@
>> * MID: The moduleID of the cpu your read this from.
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline void mxcc_set_stream_src(unsigned long *paddr)
>> {
>> @@ -133,6 +133,6 @@ static inline void mxcc_set_creg(unsigned long
>> mxcc_control)
>> "i" (ASI_M_MXCC));
>> }
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* !(_SPARC_MXCC_H) */
>> diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h
>> index 1b151f738b00e..f1ad7f7bcac23 100644
>> --- a/arch/sparc/include/asm/obio.h
>> +++ b/arch/sparc/include/asm/obio.h
>> @@ -97,7 +97,7 @@
>> #define CC_EREG 0x1F00E00 /* Error code register */
>> #define CC_CID 0x1F00F04 /* Component ID */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline int bw_get_intr_mask(int sbus_level)
>> {
>> @@ -221,6 +221,6 @@ static inline void cc_set_igen(unsigned int gen)
>> "i" (ASI_M_MXCC));
>> }
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* !(_SPARC_OBIO_H) */
>> diff --git a/arch/sparc/include/asm/openprom.h b/arch/sparc/include/asm/
>> openprom.h
>> index 69545b3e54547..ce68000dffac3 100644
>> --- a/arch/sparc/include/asm/openprom.h
>> +++ b/arch/sparc/include/asm/openprom.h
>> @@ -11,7 +11,7 @@
>> /* Empirical constants... */
>> #define LINUX_OPPROM_MAGIC 0x10010407
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/of.h>
>> /* V0 prom device operations. */
>> @@ -275,6 +275,6 @@ struct linux_prom_pci_intmask {
>> unsigned int interrupt;
>> };
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__SPARC_OPENPROM_H) */
>> diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/
>> page_32.h
>> index 9954254ea5698..c1bccbedf567e 100644
>> --- a/arch/sparc/include/asm/page_32.h
>> +++ b/arch/sparc/include/asm/page_32.h
>> @@ -13,7 +13,7 @@
>> #include <vdso/page.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
>> #define copy_page(to,from) memcpy((void *)(to), (void *)(from),
>> PAGE_SIZE)
>> @@ -108,14 +108,14 @@ typedef pte_t *pgtable_t;
>> #define TASK_UNMAPPED_BASE 0x50000000
>> -#else /* !(__ASSEMBLY__) */
>> +#else /* !(__ASSEMBLER__) */
>> #define __pgprot(x) (x)
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #define PAGE_OFFSET 0xf0000000
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern unsigned long phys_base;
>> extern unsigned long pfn_base;
>> #endif
>> diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/
>> page_64.h
>> index 2a68ff5b6eabd..d764d8a8586bd 100644
>> --- a/arch/sparc/include/asm/page_64.h
>> +++ b/arch/sparc/include/asm/page_64.h
>> @@ -30,7 +30,7 @@
>> #define HUGE_MAX_HSTATE 5
>> #endif
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
>> struct pt_regs;
>> @@ -128,7 +128,7 @@ extern unsigned long sparc64_va_hole_bottom;
>> extern unsigned long PAGE_OFFSET;
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /* The maximum number of physical memory address bits we support. The
>> * largest value we can support is whatever "KPGD_SHIFT + KPTE_BITS"
>> @@ -139,7 +139,7 @@ extern unsigned long PAGE_OFFSET;
>> #define ILOG2_4MB 22
>> #define ILOG2_256MB 28
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET)
>> #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
>> @@ -153,7 +153,7 @@ extern unsigned long PAGE_OFFSET;
>> #define virt_to_phys __pa
>> #define phys_to_virt __va
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #include <asm-generic/getorder.h>
>> diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
>> index 238376b1ffcc4..fb5ed6a59535a 100644
>> --- a/arch/sparc/include/asm/pcic.h
>> +++ b/arch/sparc/include/asm/pcic.h
>> @@ -8,7 +8,7 @@
>> #ifndef __SPARC_PCIC_H
>> #define __SPARC_PCIC_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/types.h>
>> #include <linux/smp.h>
>> diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/
>> pgtable_32.h
>> index 62bcafe38b1f6..ff11ee1831786 100644
>> --- a/arch/sparc/include/asm/pgtable_32.h
>> +++ b/arch/sparc/include/asm/pgtable_32.h
>> @@ -21,7 +21,7 @@
>> #define PGDIR_MASK (~(PGDIR_SIZE-1))
>> #define PGDIR_ALIGN(__addr) (((__addr) + ~PGDIR_MASK) & PGDIR_MASK)
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm-generic/pgtable-nopud.h>
>> #include <linux/spinlock.h>
>> @@ -428,7 +428,7 @@ static inline int io_remap_pfn_range(struct
>> vm_area_struct *vma,
>> __changed; \
>> })
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #define VMALLOC_START _AC(0xfe600000,UL)
>> #define VMALLOC_END _AC(0xffc00000,UL)
>> diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/
>> pgtable_64.h
>> index 2b7f358762c18..f1ce04744df8c 100644
>> --- a/arch/sparc/include/asm/pgtable_64.h
>> +++ b/arch/sparc/include/asm/pgtable_64.h
>> @@ -79,7 +79,7 @@
>> #error PMD_SHIFT must equal HPAGE_SHIFT for transparent huge pages.
>> #endif
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern unsigned long VMALLOC_END;
>> @@ -106,7 +106,7 @@ bool kern_addr_valid(unsigned long addr);
>> pr_err("%s:%d: bad pgd %p(%016lx) seen at (%pS)\n", \
>> __FILE__, __LINE__, &(e), pgd_val(e),
>> __builtin_return_address(0))
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /* PTE bits which are the same in SUN4U and SUN4V format. */
>> #define _PAGE_VALID _AC(0x8000000000000000,UL) /* Valid
>> TTE */
>> @@ -191,7 +191,7 @@ bool kern_addr_valid(unsigned long addr);
>> /* We borrow bit 20 to store the exclusive marker in swap PTEs. */
>> #define _PAGE_SWP_EXCLUSIVE _AC(0x0000000000100000, UL)
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);
>> @@ -1181,6 +1181,6 @@ extern unsigned long pte_leaf_size(pte_t pte);
>> #endif /* CONFIG_HUGETLB_PAGE */
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(_SPARC64_PGTABLE_H) */
>> diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/
>> pgtsrmmu.h
>> index 18e68d43f0367..a265822a475ee 100644
>> --- a/arch/sparc/include/asm/pgtsrmmu.h
>> +++ b/arch/sparc/include/asm/pgtsrmmu.h
>> @@ -10,7 +10,7 @@
>> #include <asm/page.h>
>> -#ifdef __ASSEMBLY__
>> +#ifdef __ASSEMBLER__
>> #include <asm/thread_info.h> /* TI_UWINMASK for WINDOW_FLUSH */
>> #endif
>> @@ -97,7 +97,7 @@
>> bne 99b; \
>> restore %g0, %g0, %g0;
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern unsigned long last_valid_pfn;
>> /* This makes sense. Honest it does - Anton */
>> @@ -136,6 +136,6 @@ srmmu_get_pte (unsigned long addr)
>> return entry;
>> }
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(_SPARC_PGTSRMMU_H) */
>> diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/
>> asm/processor_64.h
>> index 0a0d5c3d184c7..321859454ca4c 100644
>> --- a/arch/sparc/include/asm/processor_64.h
>> +++ b/arch/sparc/include/asm/processor_64.h
>> @@ -21,7 +21,7 @@
>> * XXX No longer using virtual page tables, kill this upper limit...
>> */
>> #define VA_BITS 44
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define VPTE_SIZE (1UL << (VA_BITS - PAGE_SHIFT + 3))
>> #else
>> #define VPTE_SIZE (1 << (VA_BITS - PAGE_SHIFT + 3))
>> @@ -45,7 +45,7 @@
>> #endif
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* The Sparc processor specific thread struct. */
>> /* XXX This should die, everything can go into thread_info now. */
>> @@ -62,7 +62,7 @@ struct thread_struct {
>> #endif
>> };
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #ifndef CONFIG_DEBUG_SPINLOCK
>> #define INIT_THREAD { \
>> @@ -75,7 +75,7 @@ struct thread_struct {
>> }
>> #endif /* !(CONFIG_DEBUG_SPINLOCK) */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/types.h>
>> #include <asm/fpumacro.h>
>> @@ -242,6 +242,6 @@ static inline void prefetchw(const void *x)
>> int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool
>> illegal_insn_trap);
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__ASM_SPARC64_PROCESSOR_H) */
>> diff --git a/arch/sparc/include/asm/psr.h b/arch/sparc/include/asm/psr.h
>> index 65127ce565abc..5af50ccda0233 100644
>> --- a/arch/sparc/include/asm/psr.h
>> +++ b/arch/sparc/include/asm/psr.h
>> @@ -14,7 +14,7 @@
>> #include <uapi/asm/psr.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* Get the %psr register. */
>> static inline unsigned int get_psr(void)
>> {
>> @@ -63,6 +63,6 @@ static inline unsigned int get_fsr(void)
>> return fsr;
>> }
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__LINUX_SPARC_PSR_H) */
>> diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/
>> ptrace.h
>> index d1419e6690274..8adf3fd2f00fe 100644
>> --- a/arch/sparc/include/asm/ptrace.h
>> +++ b/arch/sparc/include/asm/ptrace.h
>> @@ -5,7 +5,7 @@
>> #include <uapi/asm/ptrace.h>
>> #if defined(__sparc__) && defined(__arch64__)
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/compiler.h>
>> #include <linux/threads.h>
>> @@ -113,10 +113,10 @@ static inline unsigned long
>> kernel_stack_pointer(struct pt_regs *regs)
>> {
>> return regs->u_regs[UREG_I6];
>> }
>> -#else /* __ASSEMBLY__ */
>> -#endif /* __ASSEMBLY__ */
>> +#else /* __ASSEMBLER__ */
>> +#endif /* __ASSEMBLER__ */
>> #else /* (defined(__sparc__) && defined(__arch64__)) */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/switch_to.h>
>> static inline bool pt_regs_is_syscall(struct pt_regs *regs)
>> @@ -144,8 +144,8 @@ static inline bool pt_regs_clear_syscall(struct
>> pt_regs *regs)
>> #define instruction_pointer(regs) ((regs)->pc)
>> #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
>> unsigned long profile_pc(struct pt_regs *);
>> -#else /* (!__ASSEMBLY__) */
>> -#endif /* (!__ASSEMBLY__) */
>> +#else /* (!__ASSEMBLER__) */
>> +#endif /* (!__ASSEMBLER__) */
>> #endif /* (defined(__sparc__) && defined(__arch64__)) */
>> #define STACK_BIAS 2047
>> diff --git a/arch/sparc/include/asm/ross.h b/arch/sparc/include/asm/ross.h
>> index 79a54d66a2c0b..53a42b37495d0 100644
>> --- a/arch/sparc/include/asm/ross.h
>> +++ b/arch/sparc/include/asm/ross.h
>> @@ -95,7 +95,7 @@
>> #define HYPERSPARC_ICCR_FTD 0x00000002
>> #define HYPERSPARC_ICCR_ICE 0x00000001
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline unsigned int get_ross_icr(void)
>> {
>> @@ -187,6 +187,6 @@ static inline void hyper_flush_cache_page(unsigned
>> long page)
>> }
>> }
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(_SPARC_ROSS_H) */
>> diff --git a/arch/sparc/include/asm/sbi.h b/arch/sparc/include/asm/sbi.h
>> index 4d6026c1e446f..861f85b5bf9bb 100644
>> --- a/arch/sparc/include/asm/sbi.h
>> +++ b/arch/sparc/include/asm/sbi.h
>> @@ -64,7 +64,7 @@ struct sbi_regs {
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline int acquire_sbi(int devid, int mask)
>> {
>> @@ -111,6 +111,6 @@ static inline void set_sbi_ctl(int devid, int cfgno,
>> int cfg)
>> "i" (ASI_M_CTL));
>> }
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* !(_SPARC_SBI_H) */
>> diff --git a/arch/sparc/include/asm/sigcontext.h b/arch/sparc/include/asm/
>> sigcontext.h
>> index ee05f9d2bcf2c..200f95144fd29 100644
>> --- a/arch/sparc/include/asm/sigcontext.h
>> +++ b/arch/sparc/include/asm/sigcontext.h
>> @@ -5,7 +5,7 @@
>> #include <asm/ptrace.h>
>> #include <uapi/asm/sigcontext.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define __SUNOS_MAXWIN 31
>> @@ -104,6 +104,6 @@ typedef struct {
>> #endif /* (CONFIG_SPARC64) */
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__SPARC_SIGCONTEXT_H) */
>> diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/
>> signal.h
>> index 28f81081e37da..d93fe93544ec6 100644
>> --- a/arch/sparc/include/asm/signal.h
>> +++ b/arch/sparc/include/asm/signal.h
>> @@ -2,16 +2,16 @@
>> #ifndef __SPARC_SIGNAL_H
>> #define __SPARC_SIGNAL_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/personality.h>
>> #include <linux/types.h>
>> #endif
>> #include <uapi/asm/signal.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define __ARCH_HAS_KA_RESTORER
>> #define __ARCH_HAS_SA_RESTORER
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__SPARC_SIGNAL_H) */
>> diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/
>> smp_32.h
>> index 2cf7971d7f6c9..9c6ed98fbaf12 100644
>> --- a/arch/sparc/include/asm/smp_32.h
>> +++ b/arch/sparc/include/asm/smp_32.h
>> @@ -10,15 +10,15 @@
>> #include <linux/threads.h>
>> #include <asm/head.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/cpumask.h>
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> #ifdef CONFIG_SMP
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/ptrace.h>
>> #include <asm/asi.h>
>> @@ -105,7 +105,7 @@ int hard_smp_processor_id(void);
>> void smp_setup_cpu_possible_map(void);
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /* Sparc specific messages. */
>> #define MSG_CROSS_CALL 0x0005 /* run func on cpus */
>> diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/
>> smp_64.h
>> index 0964fede0b2cc..759fb4a9530ed 100644
>> --- a/arch/sparc/include/asm/smp_64.h
>> +++ b/arch/sparc/include/asm/smp_64.h
>> @@ -12,16 +12,16 @@
>> #include <asm/starfire.h>
>> #include <asm/spitfire.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <linux/cpumask.h>
>> #include <linux/cache.h>
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #ifdef CONFIG_SMP
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /*
>> * Private routines/data
>> @@ -68,7 +68,7 @@ int __cpu_disable(void);
>> void __cpu_die(unsigned int cpu);
>> #endif
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #else
>> diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/
>> asm/spinlock_32.h
>> index bc5aa6f616764..6d6d261bf8d2f 100644
>> --- a/arch/sparc/include/asm/spinlock_32.h
>> +++ b/arch/sparc/include/asm/spinlock_32.h
>> @@ -7,7 +7,7 @@
>> #ifndef __SPARC_SPINLOCK_H
>> #define __SPARC_SPINLOCK_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/psr.h>
>> #include <asm/barrier.h>
>> @@ -183,6 +183,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)
>> res; \
>> })
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* __SPARC_SPINLOCK_H */
>> diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/
>> asm/spinlock_64.h
>> index 3a9a0b0c74654..13cd15d346be4 100644
>> --- a/arch/sparc/include/asm/spinlock_64.h
>> +++ b/arch/sparc/include/asm/spinlock_64.h
>> @@ -7,13 +7,13 @@
>> #ifndef __SPARC64_SPINLOCK_H
>> #define __SPARC64_SPINLOCK_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/processor.h>
>> #include <asm/barrier.h>
>> #include <asm/qspinlock.h>
>> #include <asm/qrwlock.h>
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(__SPARC64_SPINLOCK_H) */
>> diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/
>> spitfire.h
>> index e9b7d25b29fae..79b9dd5e9ac68 100644
>> --- a/arch/sparc/include/asm/spitfire.h
>> +++ b/arch/sparc/include/asm/spitfire.h
>> @@ -68,7 +68,7 @@
>> #define CPU_ID_M8 ('8')
>> #define CPU_ID_SONOMA1 ('N')
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> enum ultra_tlb_layout {
>> spitfire = 0,
>> @@ -363,6 +363,6 @@ static inline void cheetah_put_itlb_data(int entry,
>> unsigned long data)
>> "i" (ASI_ITLB_DATA_ACCESS));
>> }
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* CONFIG_SPARC64 */
>> #endif /* !(_SPARC64_SPITFIRE_H) */
>> diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/
>> starfire.h
>> index fb1a8c499cb03..8e511ed787755 100644
>> --- a/arch/sparc/include/asm/starfire.h
>> +++ b/arch/sparc/include/asm/starfire.h
>> @@ -8,7 +8,7 @@
>> #ifndef _SPARC64_STARFIRE_H
>> #define _SPARC64_STARFIRE_H
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern int this_is_starfire;
>> diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/
>> asm/thread_info_32.h
>> index 45b4955b253f2..fdaf7b171e0ac 100644
>> --- a/arch/sparc/include/asm/thread_info_32.h
>> +++ b/arch/sparc/include/asm/thread_info_32.h
>> @@ -14,7 +14,7 @@
>> #ifdef __KERNEL__
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/ptrace.h>
>> #include <asm/page.h>
>> @@ -72,7 +72,7 @@ register struct thread_info *current_thread_info_reg
>> asm("g6");
>> */
>> #define THREAD_SIZE_ORDER 1
>> -#endif /* __ASSEMBLY__ */
>> +#endif /* __ASSEMBLER__ */
>> /* Size of kernel stack for each process */
>> #define THREAD_SIZE (2 * PAGE_SIZE)
>> diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/
>> asm/thread_info_64.h
>> index 1a44372e2bc07..c8a73dff27f80 100644
>> --- a/arch/sparc/include/asm/thread_info_64.h
>> +++ b/arch/sparc/include/asm/thread_info_64.h
>> @@ -26,7 +26,7 @@
>> #include <asm/page.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/ptrace.h>
>> #include <asm/types.h>
>> @@ -64,7 +64,7 @@ struct thread_info {
>> __attribute__ ((aligned(64)));
>> };
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /* offsets into the thread_info struct for assembly code access */
>> #define TI_TASK 0x00000000
>> @@ -110,7 +110,7 @@ struct thread_info {
>> /*
>> * macros/functions for gaining access to the thread information structure
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define INIT_THREAD_INFO(tsk) \
>> { \
>> @@ -150,7 +150,7 @@ extern struct thread_info *current_thread_info(void);
>> #define set_thread_fpdepth(val)
>> (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_FPDEPTH] = (val))
>> #define get_thread_wsaved()
>> (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED])
>> #define set_thread_wsaved(val)
>> (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED] = (val))
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> /*
>> * Thread information flags, only 16 bits are available as we encode
>> @@ -228,14 +228,14 @@ extern struct thread_info *current_thread_info(void);
>> * Note that there are only 8 bits available.
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0)
>> #define test_thread_64bit_stack(__SP) \
>> ((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \
>> false : true)
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* __KERNEL__ */
>> diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/
>> trap_block.h
>> index ace0d48e837e5..6cf2a60a0156d 100644
>> --- a/arch/sparc/include/asm/trap_block.h
>> +++ b/arch/sparc/include/asm/trap_block.h
>> @@ -7,7 +7,7 @@
>> #include <asm/hypervisor.h>
>> #include <asm/asi.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* Trap handling code needs to get at a few critical values upon
>> * trap entry and to process TSB misses. These cannot be in the
>> @@ -91,7 +91,7 @@ extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,
>> __sun_m7_2insn_patch_end;
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #define TRAP_PER_CPU_THREAD 0x00
>> #define TRAP_PER_CPU_PGD_PADDR 0x08
>> diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h
>> index 2fba2602ba69c..e4e10b0e7887d 100644
>> --- a/arch/sparc/include/asm/traps.h
>> +++ b/arch/sparc/include/asm/traps.h
>> @@ -9,7 +9,7 @@
>> #include <uapi/asm/traps.h>
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* This is for V8 compliant Sparc CPUS */
>> struct tt_entry {
>> unsigned long inst_one;
>> @@ -21,5 +21,5 @@ struct tt_entry {
>> /* We set this to _start in system setup. */
>> extern struct tt_entry *sparc_ttable;
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* !(_SPARC_TRAPS_H) */
>> diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
>> index 522a677e050d7..239be259e1669 100644
>> --- a/arch/sparc/include/asm/tsb.h
>> +++ b/arch/sparc/include/asm/tsb.h
>> @@ -59,7 +59,7 @@
>> * The kernel TSB is locked into the TLB by virtue of being in the
>> * kernel image, so we don't play these games for swapper_tsb access.
>> */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> struct tsb_ldquad_phys_patch_entry {
>> unsigned int addr;
>> unsigned int sun4u_insn;
>> diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/
>> ttable.h
>> index 8f64694080198..b32d3068cce12 100644
>> --- a/arch/sparc/include/asm/ttable.h
>> +++ b/arch/sparc/include/asm/ttable.h
>> @@ -5,7 +5,7 @@
>> #include <asm/utrap.h>
>> #include <asm/pil.h>
>> -#ifdef __ASSEMBLY__
>> +#ifdef __ASSEMBLER__
>> #include <asm/thread_info.h>
>> #endif
>> diff --git a/arch/sparc/include/asm/turbosparc.h b/arch/sparc/include/asm/
>> turbosparc.h
>> index 23df777f9cea5..5f73263b6ded8 100644
>> --- a/arch/sparc/include/asm/turbosparc.h
>> +++ b/arch/sparc/include/asm/turbosparc.h
>> @@ -57,7 +57,7 @@
>> #define TURBOSPARC_WTENABLE 0x00000020 /* Write thru for dcache */
>> #define TURBOSPARC_SNENABLE 0x40000000 /* DVMA snoop enable */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> /* Bits [13:5] select one of 512 instruction cache tags */
>> static inline void turbosparc_inv_insn_tag(unsigned long addr)
>> @@ -121,6 +121,6 @@ static inline unsigned long turbosparc_get_ccreg(void)
>> return regval;
>> }
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* !(_SPARC_TURBOSPARC_H) */
>> diff --git a/arch/sparc/include/asm/upa.h b/arch/sparc/include/asm/upa.h
>> index 782691b30f545..b1df3a7f40ed0 100644
>> --- a/arch/sparc/include/asm/upa.h
>> +++ b/arch/sparc/include/asm/upa.h
>> @@ -24,7 +24,7 @@
>> #define UPA_PORTID_ID 0x000000000000ffff /* Module
>> Identification bits */
>> /* UPA I/O space accessors */
>> -#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
>> +#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
>> static inline unsigned char _upa_readb(unsigned long addr)
>> {
>> unsigned char ret;
>> @@ -105,6 +105,6 @@ static inline void _upa_writeq(unsigned long q,
>> unsigned long addr)
>> #define upa_writew(__w, __addr) (_upa_writew((__w), (unsigned
>> long)(__addr)))
>> #define upa_writel(__l, __addr) (_upa_writel((__l), (unsigned
>> long)(__addr)))
>> #define upa_writeq(__q, __addr) (_upa_writeq((__q), (unsigned
>> long)(__addr)))
>> -#endif /* __KERNEL__ && !__ASSEMBLY__ */
>> +#endif /* __KERNEL__ && !__ASSEMBLER__ */
>> #endif /* !(_SPARC64_UPA_H) */
>> diff --git a/arch/sparc/include/asm/vaddrs.h b/arch/sparc/include/asm/
>> vaddrs.h
>> index 4fec0341e2a81..da567600c8974 100644
>> --- a/arch/sparc/include/asm/vaddrs.h
>> +++ b/arch/sparc/include/asm/vaddrs.h
>> @@ -31,7 +31,7 @@
>> */
>> #define SRMMU_NOCACHE_ALCRATIO 64 /* 256 pages per 64MB of system
>> RAM */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> #include <asm/kmap_size.h>
>> enum fixed_addresses {
>> diff --git a/arch/sparc/include/asm/viking.h b/arch/sparc/include/asm/
>> viking.h
>> index 08ffc605035f3..bbb714de43c42 100644
>> --- a/arch/sparc/include/asm/viking.h
>> +++ b/arch/sparc/include/asm/viking.h
>> @@ -110,7 +110,7 @@
>> #define VIKING_PTAG_DIRTY 0x00010000 /* Block has been modified */
>> #define VIKING_PTAG_SHARED 0x00000100 /* Shared with some other cache */
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline void viking_flush_icache(void)
>> {
>> @@ -250,6 +250,6 @@ static inline unsigned long viking_hwprobe(unsigned
>> long vaddr)
>> return val;
>> }
>> -#endif /* !__ASSEMBLY__ */
>> +#endif /* !__ASSEMBLER__ */
>> #endif /* !(_SPARC_VIKING_H) */
>> diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/
>> visasm.h
>> index 7903e84e09e05..71eb4e9afb3e0 100644
>> --- a/arch/sparc/include/asm/visasm.h
>> +++ b/arch/sparc/include/asm/visasm.h
>> @@ -45,7 +45,7 @@
>> #define VISExitHalfFast \
>> wr %o5, 0, %fprs;
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> static inline void save_and_clear_fpu(void) {
>> __asm__ __volatile__ (
>> " rd %%fprs, %%o5\n"
>> diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h
>> index 9a870f5dc3712..7612f15a261fe 100644
>> --- a/drivers/char/hw_random/n2rng.h
>> +++ b/drivers/char/hw_random/n2rng.h
>> @@ -48,7 +48,7 @@
>> #define HV_RNG_NUM_CONTROL 4
>> -#ifndef __ASSEMBLY__
>> +#ifndef __ASSEMBLER__
>> extern unsigned long sun4v_rng_get_diag_ctl(void);
>> extern unsigned long sun4v_rng_ctl_read_v1(unsigned long ctl_regs_ra,
>> unsigned long *state,
>> @@ -147,6 +147,6 @@ struct n2rng {
>> #define N2RNG_BUSY_LIMIT 100
>> #define N2RNG_HCHECK_LIMIT 100
>> -#endif /* !(__ASSEMBLY__) */
>> +#endif /* !(__ASSEMBLER__) */
>> #endif /* _N2RNG_H */
>
> Friendly ping!
>
> David, Andreas, could you maybe pick this (and the previous patch) up via
> your sparc tree? (x86 and parisc already got merge via their respective
> architecture trees, so I guess the same should happen for this patch here,
> too).
Ping^2! Any chance you could pick this up for v6.17 ?
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:10 ` [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
2025-06-06 7:22 ` Thomas Huth
@ 2025-08-03 13:33 ` John Paul Adrian Glaubitz
2025-08-04 6:01 ` Thomas Huth
2025-08-05 9:50 ` Thomas Huth
2025-09-26 15:04 ` Andreas Larsson
2 siblings, 2 replies; 94+ messages in thread
From: John Paul Adrian Glaubitz @ 2025-08-03 13:33 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, David S. Miller, Andreas Larsson,
sparclinux
Hi Thomas,
On Fri, 2025-03-14 at 08:10 +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).
>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Andreas Larsson <andreas@gaisler.com>
> Cc: sparclinux@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/sparc/include/asm/adi_64.h | 4 +-
> arch/sparc/include/asm/auxio.h | 4 +-
> arch/sparc/include/asm/auxio_32.h | 4 +-
> arch/sparc/include/asm/auxio_64.h | 4 +-
> arch/sparc/include/asm/cacheflush_64.h | 4 +-
> arch/sparc/include/asm/cpudata.h | 4 +-
> arch/sparc/include/asm/cpudata_64.h | 4 +-
> arch/sparc/include/asm/delay_64.h | 4 +-
> arch/sparc/include/asm/ftrace.h | 2 +-
> arch/sparc/include/asm/hvtramp.h | 2 +-
> arch/sparc/include/asm/hypervisor.h | 92 ++++++++++++-------------
> arch/sparc/include/asm/irqflags_32.h | 4 +-
> arch/sparc/include/asm/irqflags_64.h | 4 +-
> arch/sparc/include/asm/jump_label.h | 4 +-
> arch/sparc/include/asm/kdebug_32.h | 4 +-
> arch/sparc/include/asm/leon.h | 8 +--
> arch/sparc/include/asm/leon_amba.h | 6 +-
> arch/sparc/include/asm/mman.h | 4 +-
> arch/sparc/include/asm/mmu_64.h | 4 +-
> arch/sparc/include/asm/mmu_context_32.h | 4 +-
> arch/sparc/include/asm/mmu_context_64.h | 4 +-
> arch/sparc/include/asm/mxcc.h | 4 +-
> arch/sparc/include/asm/obio.h | 4 +-
> arch/sparc/include/asm/openprom.h | 4 +-
> arch/sparc/include/asm/page_32.h | 8 +--
> arch/sparc/include/asm/page_64.h | 8 +--
> arch/sparc/include/asm/pcic.h | 2 +-
> arch/sparc/include/asm/pgtable_32.h | 4 +-
> arch/sparc/include/asm/pgtable_64.h | 8 +--
> arch/sparc/include/asm/pgtsrmmu.h | 6 +-
> arch/sparc/include/asm/processor_64.h | 10 +--
> arch/sparc/include/asm/psr.h | 4 +-
> arch/sparc/include/asm/ptrace.h | 12 ++--
> arch/sparc/include/asm/ross.h | 4 +-
> arch/sparc/include/asm/sbi.h | 4 +-
> arch/sparc/include/asm/sigcontext.h | 4 +-
> arch/sparc/include/asm/signal.h | 6 +-
> arch/sparc/include/asm/smp_32.h | 8 +--
> arch/sparc/include/asm/smp_64.h | 8 +--
> arch/sparc/include/asm/spinlock_32.h | 4 +-
> arch/sparc/include/asm/spinlock_64.h | 4 +-
> arch/sparc/include/asm/spitfire.h | 4 +-
> arch/sparc/include/asm/starfire.h | 2 +-
> arch/sparc/include/asm/thread_info_32.h | 4 +-
> arch/sparc/include/asm/thread_info_64.h | 12 ++--
> arch/sparc/include/asm/trap_block.h | 4 +-
> arch/sparc/include/asm/traps.h | 4 +-
> arch/sparc/include/asm/tsb.h | 2 +-
> arch/sparc/include/asm/ttable.h | 2 +-
> arch/sparc/include/asm/turbosparc.h | 4 +-
> arch/sparc/include/asm/upa.h | 4 +-
> arch/sparc/include/asm/vaddrs.h | 2 +-
> arch/sparc/include/asm/viking.h | 4 +-
> arch/sparc/include/asm/visasm.h | 2 +-
> drivers/char/hw_random/n2rng.h | 4 +-
> 55 files changed, 172 insertions(+), 172 deletions(-)
>
> diff --git a/arch/sparc/include/asm/adi_64.h b/arch/sparc/include/asm/adi_64.h
> index 4301c6fd87f7a..0c066fdab6963 100644
> --- a/arch/sparc/include/asm/adi_64.h
> +++ b/arch/sparc/include/asm/adi_64.h
> @@ -9,7 +9,7 @@
>
> #include <linux/types.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct adi_caps {
> __u64 blksz;
> @@ -41,6 +41,6 @@ static inline unsigned long adi_nbits(void)
> return adi_state.caps.nbits;
> }
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* !(__ASM_SPARC64_ADI_H) */
> diff --git a/arch/sparc/include/asm/auxio.h b/arch/sparc/include/asm/auxio.h
> index a2681052e9000..d0a933ed0d04b 100644
> --- a/arch/sparc/include/asm/auxio.h
> +++ b/arch/sparc/include/asm/auxio.h
> @@ -2,11 +2,11 @@
> #ifndef ___ASM_SPARC_AUXIO_H
> #define ___ASM_SPARC_AUXIO_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern void __iomem *auxio_register;
>
> -#endif /* ifndef __ASSEMBLY__ */
> +#endif /* ifndef __ASSEMBLER__ */
>
> #if defined(__sparc__) && defined(__arch64__)
> #include <asm/auxio_64.h>
> diff --git a/arch/sparc/include/asm/auxio_32.h b/arch/sparc/include/asm/auxio_32.h
> index 852457c7a265a..db58fa28de9ec 100644
> --- a/arch/sparc/include/asm/auxio_32.h
> +++ b/arch/sparc/include/asm/auxio_32.h
> @@ -29,7 +29,7 @@
> #define AUXIO_FLPY_EJCT 0x02 /* Eject floppy disk. Write only. */
> #define AUXIO_LED 0x01 /* On if set, off if unset. Read/Write */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * NOTE: these routines are implementation dependent--
> @@ -75,7 +75,7 @@ do { \
> } \
> } while (0)
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
>
> /* AUXIO2 (Power Off Control) */
> diff --git a/arch/sparc/include/asm/auxio_64.h b/arch/sparc/include/asm/auxio_64.h
> index ae1ed41987db7..8a4ae07daf168 100644
> --- a/arch/sparc/include/asm/auxio_64.h
> +++ b/arch/sparc/include/asm/auxio_64.h
> @@ -74,7 +74,7 @@
> #define AUXIO_PCIO_CPWR_OFF 0x02 /* Courtesy Power Off */
> #define AUXIO_PCIO_SPWR_OFF 0x01 /* System Power Off */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define AUXIO_LTE_ON 1
> #define AUXIO_LTE_OFF 0
> @@ -94,6 +94,6 @@ void auxio_set_lte(int on);
> */
> void auxio_set_led(int on);
>
> -#endif /* ifndef __ASSEMBLY__ */
> +#endif /* ifndef __ASSEMBLER__ */
>
> #endif /* !(_SPARC64_AUXIO_H) */
> diff --git a/arch/sparc/include/asm/cacheflush_64.h b/arch/sparc/include/asm/cacheflush_64.h
> index 2b1261b77ecd1..06092572c0455 100644
> --- a/arch/sparc/include/asm/cacheflush_64.h
> +++ b/arch/sparc/include/asm/cacheflush_64.h
> @@ -4,7 +4,7 @@
>
> #include <asm/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/mm.h>
>
> @@ -78,6 +78,6 @@ void flush_ptrace_access(struct vm_area_struct *, struct page *,
> #define flush_cache_vmap_early(start, end) do { } while (0)
> #define flush_cache_vunmap(start, end) do { } while (0)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* _SPARC64_CACHEFLUSH_H */
> diff --git a/arch/sparc/include/asm/cpudata.h b/arch/sparc/include/asm/cpudata.h
> index d213165ee713b..67022a153023f 100644
> --- a/arch/sparc/include/asm/cpudata.h
> +++ b/arch/sparc/include/asm/cpudata.h
> @@ -2,14 +2,14 @@
> #ifndef ___ASM_SPARC_CPUDATA_H
> #define ___ASM_SPARC_CPUDATA_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/threads.h>
> #include <linux/percpu.h>
>
> extern const struct seq_operations cpuinfo_op;
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #if defined(__sparc__) && defined(__arch64__)
> #include <asm/cpudata_64.h>
> diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h
> index 9c3fc03abe9ae..056b3c0e7ef94 100644
> --- a/arch/sparc/include/asm/cpudata_64.h
> +++ b/arch/sparc/include/asm/cpudata_64.h
> @@ -7,7 +7,7 @@
> #ifndef _SPARC64_CPUDATA_H
> #define _SPARC64_CPUDATA_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> typedef struct {
> /* Dcache line 1 */
> @@ -35,7 +35,7 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
> #define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
> #define local_cpu_data() (*this_cpu_ptr(&__cpu_data))
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #include <asm/trap_block.h>
>
> diff --git a/arch/sparc/include/asm/delay_64.h b/arch/sparc/include/asm/delay_64.h
> index 22213b1c119d2..5de5b5f23188c 100644
> --- a/arch/sparc/include/asm/delay_64.h
> +++ b/arch/sparc/include/asm/delay_64.h
> @@ -7,12 +7,12 @@
> #ifndef _SPARC64_DELAY_H
> #define _SPARC64_DELAY_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> void __delay(unsigned long loops);
> void udelay(unsigned long usecs);
> #define mdelay(n) udelay((n) * 1000)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* _SPARC64_DELAY_H */
> diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/ftrace.h
> index e284394cb3aa2..f7c9036199c5e 100644
> --- a/arch/sparc/include/asm/ftrace.h
> +++ b/arch/sparc/include/asm/ftrace.h
> @@ -6,7 +6,7 @@
> #define MCOUNT_ADDR ((unsigned long)(_mcount))
> #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void _mcount(void);
> #endif
>
> diff --git a/arch/sparc/include/asm/hvtramp.h b/arch/sparc/include/asm/hvtramp.h
> index ce2453ea4f2be..8cf7a54fa528a 100644
> --- a/arch/sparc/include/asm/hvtramp.h
> +++ b/arch/sparc/include/asm/hvtramp.h
> @@ -2,7 +2,7 @@
> #ifndef _SPARC64_HVTRAP_H
> #define _SPARC64_HVTRAP_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
>
> diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
> index f220edcf17c7c..94ac56d43746b 100644
> --- a/arch/sparc/include/asm/hypervisor.h
> +++ b/arch/sparc/include/asm/hypervisor.h
> @@ -102,7 +102,7 @@
> */
> #define HV_FAST_MACH_EXIT 0x00
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void sun4v_mach_exit(unsigned long exit_code);
> #endif
>
> @@ -131,7 +131,7 @@ void sun4v_mach_exit(unsigned long exit_code);
> */
> #define HV_FAST_MACH_DESC 0x01
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mach_desc(unsigned long buffer_pa,
> unsigned long buf_len,
> unsigned long *real_buf_len);
> @@ -152,7 +152,7 @@ unsigned long sun4v_mach_desc(unsigned long buffer_pa,
> */
> #define HV_FAST_MACH_SIR 0x02
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void sun4v_mach_sir(void);
> #endif
>
> @@ -208,7 +208,7 @@ void sun4v_mach_sir(void);
> */
> #define HV_FAST_MACH_SET_WATCHDOG 0x05
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
> unsigned long *orig_timeout);
> #endif
> @@ -254,7 +254,7 @@ unsigned long sun4v_mach_set_watchdog(unsigned long timeout,
> */
> #define HV_FAST_CPU_START 0x10
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_start(unsigned long cpuid,
> unsigned long pc,
> unsigned long rtba,
> @@ -282,7 +282,7 @@ unsigned long sun4v_cpu_start(unsigned long cpuid,
> */
> #define HV_FAST_CPU_STOP 0x11
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_stop(unsigned long cpuid);
> #endif
>
> @@ -299,7 +299,7 @@ unsigned long sun4v_cpu_stop(unsigned long cpuid);
> */
> #define HV_FAST_CPU_YIELD 0x12
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_yield(void);
> #endif
>
> @@ -317,7 +317,7 @@ unsigned long sun4v_cpu_yield(void);
> */
> #define HV_FAST_CPU_POKE 0x13
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_poke(unsigned long cpuid);
> #endif
>
> @@ -363,7 +363,7 @@ unsigned long sun4v_cpu_poke(unsigned long cpuid);
> #define HV_CPU_QUEUE_RES_ERROR 0x3e
> #define HV_CPU_QUEUE_NONRES_ERROR 0x3f
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_qconf(unsigned long type,
> unsigned long queue_paddr,
> unsigned long num_queue_entries);
> @@ -416,7 +416,7 @@ unsigned long sun4v_cpu_qconf(unsigned long type,
> */
> #define HV_FAST_CPU_MONDO_SEND 0x42
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
> unsigned long cpu_list_pa,
> unsigned long mondo_block_pa);
> @@ -449,7 +449,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count,
> #define HV_CPU_STATE_RUNNING 0x02
> #define HV_CPU_STATE_ERROR 0x03
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> long sun4v_cpu_state(unsigned long cpuid);
> #endif
>
> @@ -485,7 +485,7 @@ long sun4v_cpu_state(unsigned long cpuid);
> *
> * Layout of a TSB description for mmu_tsb_ctx{,non}0() calls.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_tsb_descr {
> unsigned short pgsz_idx;
> unsigned short assoc;
> @@ -536,7 +536,7 @@ struct hv_tsb_descr {
> * The fault status block is a multiple of 64-bytes and must be aligned
> * on a 64-byte boundary.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_fault_status {
> unsigned long i_fault_type;
> unsigned long i_fault_addr;
> @@ -651,7 +651,7 @@ struct hv_fault_status {
> */
> #define HV_FAST_MMU_TSB_CTX0 0x20
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
> unsigned long tsb_desc_ra);
> #endif
> @@ -736,7 +736,7 @@ unsigned long sun4v_mmu_tsb_ctx0(unsigned long num_descriptions,
> */
> #define HV_FAST_MMU_DEMAP_ALL 0x24
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> void sun4v_mmu_demap_all(void);
> #endif
>
> @@ -766,7 +766,7 @@ void sun4v_mmu_demap_all(void);
> */
> #define HV_FAST_MMU_MAP_PERM_ADDR 0x25
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
> unsigned long set_to_zero,
> unsigned long tte,
> @@ -990,7 +990,7 @@ unsigned long sun4v_mmu_map_perm_addr(unsigned long vaddr,
> */
>
> #define HV_CCB_SUBMIT 0x34
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
> unsigned long len,
> unsigned long flags,
> @@ -1035,7 +1035,7 @@ unsigned long sun4v_ccb_submit(unsigned long ccb_buf,
> */
>
> #define HV_CCB_INFO 0x35
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ccb_info(unsigned long ca,
> void *info_arr);
> #endif
> @@ -1069,7 +1069,7 @@ unsigned long sun4v_ccb_info(unsigned long ca,
> */
>
> #define HV_CCB_KILL 0x36
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ccb_kill(unsigned long ca,
> void *kill_status);
> #endif
> @@ -1104,7 +1104,7 @@ unsigned long sun4v_ccb_kill(unsigned long ca,
> */
> #define HV_FAST_TOD_GET 0x50
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_tod_get(unsigned long *time);
> #endif
>
> @@ -1121,7 +1121,7 @@ unsigned long sun4v_tod_get(unsigned long *time);
> */
> #define HV_FAST_TOD_SET 0x51
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_tod_set(unsigned long time);
> #endif
>
> @@ -1197,7 +1197,7 @@ unsigned long sun4v_tod_set(unsigned long time);
> */
> #define HV_FAST_CONS_WRITE 0x63
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> long sun4v_con_getchar(long *status);
> long sun4v_con_putchar(long c);
> long sun4v_con_read(unsigned long buffer,
> @@ -1239,7 +1239,7 @@ unsigned long sun4v_con_write(unsigned long buffer,
> #define HV_SOFT_STATE_NORMAL 0x01
> #define HV_SOFT_STATE_TRANSITION 0x02
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
> unsigned long msg_string_ra);
> #endif
> @@ -1318,7 +1318,7 @@ unsigned long sun4v_mach_set_soft_state(unsigned long soft_state,
> */
> #define HV_FAST_SVC_CLRSTATUS 0x84
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_svc_send(unsigned long svc_id,
> unsigned long buffer,
> unsigned long buffer_size,
> @@ -1348,7 +1348,7 @@ unsigned long sun4v_svc_clrstatus(unsigned long svc_id,
> * start (offset 0) of the trap trace buffer, and is described as
> * follows:
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_trap_trace_control {
> unsigned long head_offset;
> unsigned long tail_offset;
> @@ -1367,7 +1367,7 @@ struct hv_trap_trace_control {
> *
> * Each trap trace buffer entry is laid out as follows:
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_trap_trace_entry {
> unsigned char type; /* Hypervisor or guest entry? */
> unsigned char hpstate; /* Hyper-privileged state */
> @@ -1617,7 +1617,7 @@ struct hv_trap_trace_entry {
> */
> #define HV_FAST_INTR_DEVINO2SYSINO 0xa0
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
> unsigned long devino);
> #endif
> @@ -1635,7 +1635,7 @@ unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
> */
> #define HV_FAST_INTR_GETENABLED 0xa1
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_getenabled(unsigned long sysino);
> #endif
>
> @@ -1651,7 +1651,7 @@ unsigned long sun4v_intr_getenabled(unsigned long sysino);
> */
> #define HV_FAST_INTR_SETENABLED 0xa2
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_setenabled(unsigned long sysino,
> unsigned long intr_enabled);
> #endif
> @@ -1668,7 +1668,7 @@ unsigned long sun4v_intr_setenabled(unsigned long sysino,
> */
> #define HV_FAST_INTR_GETSTATE 0xa3
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_getstate(unsigned long sysino);
> #endif
>
> @@ -1688,7 +1688,7 @@ unsigned long sun4v_intr_getstate(unsigned long sysino);
> */
> #define HV_FAST_INTR_SETSTATE 0xa4
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state);
> #endif
>
> @@ -1706,7 +1706,7 @@ unsigned long sun4v_intr_setstate(unsigned long sysino, unsigned long intr_state
> */
> #define HV_FAST_INTR_GETTARGET 0xa5
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_gettarget(unsigned long sysino);
> #endif
>
> @@ -1723,7 +1723,7 @@ unsigned long sun4v_intr_gettarget(unsigned long sysino);
> */
> #define HV_FAST_INTR_SETTARGET 0xa6
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
> #endif
>
> @@ -1807,7 +1807,7 @@ unsigned long sun4v_intr_settarget(unsigned long sysino, unsigned long cpuid);
> */
> #define HV_FAST_VINTR_SET_TARGET 0xae
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_vintr_get_cookie(unsigned long dev_handle,
> unsigned long dev_ino,
> unsigned long *cookie);
> @@ -3047,7 +3047,7 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
> #define LDC_MTE_SZ64K 0x0000000000000001 /* 64K page */
> #define LDC_MTE_SZ8K 0x0000000000000000 /* 8K page */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct ldc_mtable_entry {
> unsigned long mte;
> unsigned long cookie;
> @@ -3130,7 +3130,7 @@ struct ldc_mtable_entry {
> */
> #define HV_FAST_LDC_REVOKE 0xef
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ldc_tx_qconf(unsigned long channel,
> unsigned long ra,
> unsigned long num_entries);
> @@ -3230,7 +3230,7 @@ unsigned long sun4v_ldc_revoke(unsigned long channel,
> #define HV_FAST_N2_GET_PERFREG 0x104
> #define HV_FAST_N2_SET_PERFREG 0x105
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_niagara_getperf(unsigned long reg,
> unsigned long *val);
> unsigned long sun4v_niagara_setperf(unsigned long reg,
> @@ -3247,7 +3247,7 @@ unsigned long sun4v_niagara2_setperf(unsigned long reg,
> * a buffer where these statistics can be collected. It is continually
> * updated once configured. The layout is as follows:
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_mmu_statistics {
> unsigned long immu_tsb_hits_ctx0_8k_tte;
> unsigned long immu_tsb_ticks_ctx0_8k_tte;
> @@ -3332,7 +3332,7 @@ struct hv_mmu_statistics {
> */
> #define HV_FAST_MMUSTAT_INFO 0x103
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_mmustat_conf(unsigned long ra, unsigned long *orig_ra);
> unsigned long sun4v_mmustat_info(unsigned long *ra);
> #endif
> @@ -3343,7 +3343,7 @@ unsigned long sun4v_mmustat_info(unsigned long *ra);
> #define HV_NCS_QCONF 0x01
> #define HV_NCS_QTAIL_UPDATE 0x02
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct hv_ncs_queue_entry {
> /* MAU Control Register */
> unsigned long mau_control;
> @@ -3422,7 +3422,7 @@ struct hv_ncs_qtail_update_arg {
> */
> #define HV_FAST_NCS_REQUEST 0x110
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_ncs_request(unsigned long request,
> unsigned long arg_ra,
> unsigned long arg_size);
> @@ -3433,7 +3433,7 @@ unsigned long sun4v_ncs_request(unsigned long request,
>
> #define HV_FAST_REBOOT_DATA_SET 0x172
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_reboot_data_set(unsigned long ra,
> unsigned long len);
> #endif
> @@ -3441,7 +3441,7 @@ unsigned long sun4v_reboot_data_set(unsigned long ra,
> #define HV_FAST_VT_GET_PERFREG 0x184
> #define HV_FAST_VT_SET_PERFREG 0x185
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_vt_get_perfreg(unsigned long reg_num,
> unsigned long *reg_val);
> unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
> @@ -3451,7 +3451,7 @@ unsigned long sun4v_vt_set_perfreg(unsigned long reg_num,
> #define HV_FAST_T5_GET_PERFREG 0x1a8
> #define HV_FAST_T5_SET_PERFREG 0x1a9
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_t5_get_perfreg(unsigned long reg_num,
> unsigned long *reg_val);
> unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
> @@ -3462,7 +3462,7 @@ unsigned long sun4v_t5_set_perfreg(unsigned long reg_num,
> #define HV_FAST_M7_GET_PERFREG 0x43
> #define HV_FAST_M7_SET_PERFREG 0x44
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_m7_get_perfreg(unsigned long reg_num,
> unsigned long *reg_val);
> unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
> @@ -3506,7 +3506,7 @@ unsigned long sun4v_m7_set_perfreg(unsigned long reg_num,
> #define HV_GRP_T5_CPU 0x0211
> #define HV_GRP_DIAG 0x0300
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> unsigned long sun4v_get_version(unsigned long group,
> unsigned long *major,
> unsigned long *minor);
> diff --git a/arch/sparc/include/asm/irqflags_32.h b/arch/sparc/include/asm/irqflags_32.h
> index 7ca3eaf3dace9..f5f20774faac1 100644
> --- a/arch/sparc/include/asm/irqflags_32.h
> +++ b/arch/sparc/include/asm/irqflags_32.h
> @@ -11,7 +11,7 @@
> #ifndef _ASM_IRQFLAGS_H
> #define _ASM_IRQFLAGS_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <asm/psr.h>
> @@ -43,6 +43,6 @@ static inline notrace bool arch_irqs_disabled(void)
> return arch_irqs_disabled_flags(arch_local_save_flags());
> }
>
> -#endif /* (__ASSEMBLY__) */
> +#endif /* (__ASSEMBLER__) */
>
> #endif /* !(_ASM_IRQFLAGS_H) */
> diff --git a/arch/sparc/include/asm/irqflags_64.h b/arch/sparc/include/asm/irqflags_64.h
> index c29ed571ae49e..0071566c2c223 100644
> --- a/arch/sparc/include/asm/irqflags_64.h
> +++ b/arch/sparc/include/asm/irqflags_64.h
> @@ -13,7 +13,7 @@
>
> #include <asm/pil.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline notrace unsigned long arch_local_save_flags(void)
> {
> @@ -93,6 +93,6 @@ static inline notrace unsigned long arch_local_irq_save(void)
> return flags;
> }
>
> -#endif /* (__ASSEMBLY__) */
> +#endif /* (__ASSEMBLER__) */
>
> #endif /* !(_ASM_IRQFLAGS_H) */
> diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h
> index 2718cbea826a7..f49d1e6104e11 100644
> --- a/arch/sparc/include/asm/jump_label.h
> +++ b/arch/sparc/include/asm/jump_label.h
> @@ -2,7 +2,7 @@
> #ifndef _ASM_SPARC_JUMP_LABEL_H
> #define _ASM_SPARC_JUMP_LABEL_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
>
> @@ -48,5 +48,5 @@ struct jump_entry {
> jump_label_t key;
> };
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif
> diff --git a/arch/sparc/include/asm/kdebug_32.h b/arch/sparc/include/asm/kdebug_32.h
> index 763d423823bdd..7627701a032cf 100644
> --- a/arch/sparc/include/asm/kdebug_32.h
> +++ b/arch/sparc/include/asm/kdebug_32.h
> @@ -19,7 +19,7 @@
>
> #define DEBUG_BP_TRAP 126
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /* The debug vector is passed in %o1 at boot time. It is a pointer to
> * a structure in the debuggers address space. Here is its format.
> */
> @@ -64,7 +64,7 @@ enum die_val {
> DIE_OOPS,
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* Some nice offset defines for assembler code. */
> #define KDEBUG_ENTRY_OFF 0x0
> diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
> index c1e05e4ab9e35..053a24b67aeda 100644
> --- a/arch/sparc/include/asm/leon.h
> +++ b/arch/sparc/include/asm/leon.h
> @@ -59,7 +59,7 @@
> #define ASI_LEON3_SYSCTRL_CFG_SNOOPING (1 << 27)
> #define ASI_LEON3_SYSCTRL_CFG_SSIZE(c) (1 << ((c >> 20) & 0xf))
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* do a physical address bypass write, i.e. for 0x80000000 */
> static inline void leon_store_reg(unsigned long paddr, unsigned long value)
> @@ -132,7 +132,7 @@ static inline int sparc_leon3_cpuid(void)
> return sparc_leon3_asr17() >> 28;
> }
>
> -#endif /*!__ASSEMBLY__*/
> +#endif /*!__ASSEMBLER__*/
>
> #ifdef CONFIG_SMP
> # define LEON3_IRQ_IPI_DEFAULT 13
> @@ -194,7 +194,7 @@ static inline int sparc_leon3_cpuid(void)
> #define LEON2_CCR_DSETS_MASK 0x03000000UL
> #define LEON2_CFG_SSIZE_MASK 0x00007000UL
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct vm_area_struct;
>
> unsigned long leon_swprobe(unsigned long vaddr, unsigned long *paddr);
> @@ -247,7 +247,7 @@ extern int leon_ipi_irq;
>
> #endif /* CONFIG_SMP */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /* macros used in leon_mm.c */
> #define PFN(x) ((x) >> PAGE_SHIFT)
> diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h
> index 6433a93f51264..2ff5714d7a63a 100644
> --- a/arch/sparc/include/asm/leon_amba.h
> +++ b/arch/sparc/include/asm/leon_amba.h
> @@ -8,7 +8,7 @@
> #ifndef LEON_AMBA_H_INCLUDE
> #define LEON_AMBA_H_INCLUDE
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct amba_prom_registers {
> unsigned int phys_addr; /* The physical address of this register */
> @@ -89,7 +89,7 @@ struct amba_prom_registers {
> #define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7)
> #define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct leon3_irqctrl_regs_map {
> u32 ilevel;
> @@ -189,7 +189,7 @@ extern int leon_debug_irqout;
> extern unsigned long leon3_gptimer_irq;
> extern unsigned int sparc_leon_eirq;
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #define LEON3_IO_AREA 0xfff00000
> #define LEON3_CONF_AREA 0xff000
> diff --git a/arch/sparc/include/asm/mman.h b/arch/sparc/include/asm/mman.h
> index af9c10c83dc58..0ae05fbdc023e 100644
> --- a/arch/sparc/include/asm/mman.h
> +++ b/arch/sparc/include/asm/mman.h
> @@ -4,7 +4,7 @@
>
> #include <uapi/asm/mman.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len)
> int sparc_mmap_check(unsigned long addr, unsigned long len);
>
> @@ -87,5 +87,5 @@ static inline bool arch_validate_flags(unsigned long vm_flags)
> }
> #endif /* CONFIG_SPARC64 */
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
> #endif /* __SPARC_MMAN_H__ */
> diff --git a/arch/sparc/include/asm/mmu_64.h b/arch/sparc/include/asm/mmu_64.h
> index 7e2704c770e9f..4eeb938f3e61c 100644
> --- a/arch/sparc/include/asm/mmu_64.h
> +++ b/arch/sparc/include/asm/mmu_64.h
> @@ -59,7 +59,7 @@
> #define CTX_HWBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_HW_MASK)
> #define CTX_NRBITS(__ctx) ((__ctx.sparc64_ctx_val) & CTX_NR_MASK)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define TSB_ENTRY_ALIGNMENT 16
>
> @@ -117,7 +117,7 @@ typedef struct {
> spinlock_t tag_lock;
> } mm_context_t;
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #define TSB_CONFIG_TSB 0x00
> #define TSB_CONFIG_RSS_LIMIT 0x08
> diff --git a/arch/sparc/include/asm/mmu_context_32.h b/arch/sparc/include/asm/mmu_context_32.h
> index 509043f815602..d9ff73f776f93 100644
> --- a/arch/sparc/include/asm/mmu_context_32.h
> +++ b/arch/sparc/include/asm/mmu_context_32.h
> @@ -2,7 +2,7 @@
> #ifndef __SPARC_MMU_CONTEXT_H
> #define __SPARC_MMU_CONTEXT_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm-generic/mm_hooks.h>
>
> @@ -29,6 +29,6 @@ void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm,
>
> #include <asm-generic/mmu_context.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC_MMU_CONTEXT_H) */
> diff --git a/arch/sparc/include/asm/mmu_context_64.h b/arch/sparc/include/asm/mmu_context_64.h
> index 08160bf9a0f41..78bbacc14d2d9 100644
> --- a/arch/sparc/include/asm/mmu_context_64.h
> +++ b/arch/sparc/include/asm/mmu_context_64.h
> @@ -4,7 +4,7 @@
>
> /* Derived heavily from Linus's Alpha/AXP ASN code... */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/spinlock.h>
> #include <linux/mm_types.h>
> @@ -193,6 +193,6 @@ static inline unsigned long mm_untag_mask(struct mm_struct *mm)
>
> #include <asm-generic/mmu_context.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC64_MMU_CONTEXT_H) */
> diff --git a/arch/sparc/include/asm/mxcc.h b/arch/sparc/include/asm/mxcc.h
> index 3a2561bea4dd4..bd6339dcf693d 100644
> --- a/arch/sparc/include/asm/mxcc.h
> +++ b/arch/sparc/include/asm/mxcc.h
> @@ -84,7 +84,7 @@
> * MID: The moduleID of the cpu your read this from.
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline void mxcc_set_stream_src(unsigned long *paddr)
> {
> @@ -133,6 +133,6 @@ static inline void mxcc_set_creg(unsigned long mxcc_control)
> "i" (ASI_M_MXCC));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_MXCC_H) */
> diff --git a/arch/sparc/include/asm/obio.h b/arch/sparc/include/asm/obio.h
> index 1b151f738b00e..f1ad7f7bcac23 100644
> --- a/arch/sparc/include/asm/obio.h
> +++ b/arch/sparc/include/asm/obio.h
> @@ -97,7 +97,7 @@
> #define CC_EREG 0x1F00E00 /* Error code register */
> #define CC_CID 0x1F00F04 /* Component ID */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline int bw_get_intr_mask(int sbus_level)
> {
> @@ -221,6 +221,6 @@ static inline void cc_set_igen(unsigned int gen)
> "i" (ASI_M_MXCC));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_OBIO_H) */
> diff --git a/arch/sparc/include/asm/openprom.h b/arch/sparc/include/asm/openprom.h
> index 69545b3e54547..ce68000dffac3 100644
> --- a/arch/sparc/include/asm/openprom.h
> +++ b/arch/sparc/include/asm/openprom.h
> @@ -11,7 +11,7 @@
> /* Empirical constants... */
> #define LINUX_OPPROM_MAGIC 0x10010407
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/of.h>
>
> /* V0 prom device operations. */
> @@ -275,6 +275,6 @@ struct linux_prom_pci_intmask {
> unsigned int interrupt;
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC_OPENPROM_H) */
> diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
> index 9954254ea5698..c1bccbedf567e 100644
> --- a/arch/sparc/include/asm/page_32.h
> +++ b/arch/sparc/include/asm/page_32.h
> @@ -13,7 +13,7 @@
>
> #include <vdso/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
> #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE)
> @@ -108,14 +108,14 @@ typedef pte_t *pgtable_t;
>
> #define TASK_UNMAPPED_BASE 0x50000000
>
> -#else /* !(__ASSEMBLY__) */
> +#else /* !(__ASSEMBLER__) */
>
> #define __pgprot(x) (x)
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #define PAGE_OFFSET 0xf0000000
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long phys_base;
> extern unsigned long pfn_base;
> #endif
> diff --git a/arch/sparc/include/asm/page_64.h b/arch/sparc/include/asm/page_64.h
> index 2a68ff5b6eabd..d764d8a8586bd 100644
> --- a/arch/sparc/include/asm/page_64.h
> +++ b/arch/sparc/include/asm/page_64.h
> @@ -30,7 +30,7 @@
> #define HUGE_MAX_HSTATE 5
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
> struct pt_regs;
> @@ -128,7 +128,7 @@ extern unsigned long sparc64_va_hole_bottom;
>
> extern unsigned long PAGE_OFFSET;
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* The maximum number of physical memory address bits we support. The
> * largest value we can support is whatever "KPGD_SHIFT + KPTE_BITS"
> @@ -139,7 +139,7 @@ extern unsigned long PAGE_OFFSET;
> #define ILOG2_4MB 22
> #define ILOG2_256MB 28
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET)
> #define __va(x) ((void *)((unsigned long) (x) + PAGE_OFFSET))
> @@ -153,7 +153,7 @@ extern unsigned long PAGE_OFFSET;
> #define virt_to_phys __pa
> #define phys_to_virt __va
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #include <asm-generic/getorder.h>
>
> diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
> index 238376b1ffcc4..fb5ed6a59535a 100644
> --- a/arch/sparc/include/asm/pcic.h
> +++ b/arch/sparc/include/asm/pcic.h
> @@ -8,7 +8,7 @@
> #ifndef __SPARC_PCIC_H
> #define __SPARC_PCIC_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <linux/smp.h>
> diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
> index 62bcafe38b1f6..ff11ee1831786 100644
> --- a/arch/sparc/include/asm/pgtable_32.h
> +++ b/arch/sparc/include/asm/pgtable_32.h
> @@ -21,7 +21,7 @@
> #define PGDIR_MASK (~(PGDIR_SIZE-1))
> #define PGDIR_ALIGN(__addr) (((__addr) + ~PGDIR_MASK) & PGDIR_MASK)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm-generic/pgtable-nopud.h>
>
> #include <linux/spinlock.h>
> @@ -428,7 +428,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
> __changed; \
> })
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #define VMALLOC_START _AC(0xfe600000,UL)
> #define VMALLOC_END _AC(0xffc00000,UL)
> diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
> index 2b7f358762c18..f1ce04744df8c 100644
> --- a/arch/sparc/include/asm/pgtable_64.h
> +++ b/arch/sparc/include/asm/pgtable_64.h
> @@ -79,7 +79,7 @@
> #error PMD_SHIFT must equal HPAGE_SHIFT for transparent huge pages.
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern unsigned long VMALLOC_END;
>
> @@ -106,7 +106,7 @@ bool kern_addr_valid(unsigned long addr);
> pr_err("%s:%d: bad pgd %p(%016lx) seen at (%pS)\n", \
> __FILE__, __LINE__, &(e), pgd_val(e), __builtin_return_address(0))
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* PTE bits which are the same in SUN4U and SUN4V format. */
> #define _PAGE_VALID _AC(0x8000000000000000,UL) /* Valid TTE */
> @@ -191,7 +191,7 @@ bool kern_addr_valid(unsigned long addr);
> /* We borrow bit 20 to store the exclusive marker in swap PTEs. */
> #define _PAGE_SWP_EXCLUSIVE _AC(0x0000000000100000, UL)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long);
>
> @@ -1181,6 +1181,6 @@ extern unsigned long pte_leaf_size(pte_t pte);
>
> #endif /* CONFIG_HUGETLB_PAGE */
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(_SPARC64_PGTABLE_H) */
> diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
> index 18e68d43f0367..a265822a475ee 100644
> --- a/arch/sparc/include/asm/pgtsrmmu.h
> +++ b/arch/sparc/include/asm/pgtsrmmu.h
> @@ -10,7 +10,7 @@
>
> #include <asm/page.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
> #include <asm/thread_info.h> /* TI_UWINMASK for WINDOW_FLUSH */
> #endif
>
> @@ -97,7 +97,7 @@
> bne 99b; \
> restore %g0, %g0, %g0;
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long last_valid_pfn;
>
> /* This makes sense. Honest it does - Anton */
> @@ -136,6 +136,6 @@ srmmu_get_pte (unsigned long addr)
> return entry;
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(_SPARC_PGTSRMMU_H) */
> diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
> index 0a0d5c3d184c7..321859454ca4c 100644
> --- a/arch/sparc/include/asm/processor_64.h
> +++ b/arch/sparc/include/asm/processor_64.h
> @@ -21,7 +21,7 @@
> * XXX No longer using virtual page tables, kill this upper limit...
> */
> #define VA_BITS 44
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #define VPTE_SIZE (1UL << (VA_BITS - PAGE_SHIFT + 3))
> #else
> #define VPTE_SIZE (1 << (VA_BITS - PAGE_SHIFT + 3))
> @@ -45,7 +45,7 @@
>
> #endif
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* The Sparc processor specific thread struct. */
> /* XXX This should die, everything can go into thread_info now. */
> @@ -62,7 +62,7 @@ struct thread_struct {
> #endif
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #ifndef CONFIG_DEBUG_SPINLOCK
> #define INIT_THREAD { \
> @@ -75,7 +75,7 @@ struct thread_struct {
> }
> #endif /* !(CONFIG_DEBUG_SPINLOCK) */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/types.h>
> #include <asm/fpumacro.h>
> @@ -242,6 +242,6 @@ static inline void prefetchw(const void *x)
>
> int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool illegal_insn_trap);
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__ASM_SPARC64_PROCESSOR_H) */
> diff --git a/arch/sparc/include/asm/psr.h b/arch/sparc/include/asm/psr.h
> index 65127ce565abc..5af50ccda0233 100644
> --- a/arch/sparc/include/asm/psr.h
> +++ b/arch/sparc/include/asm/psr.h
> @@ -14,7 +14,7 @@
> #include <uapi/asm/psr.h>
>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /* Get the %psr register. */
> static inline unsigned int get_psr(void)
> {
> @@ -63,6 +63,6 @@ static inline unsigned int get_fsr(void)
> return fsr;
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__LINUX_SPARC_PSR_H) */
> diff --git a/arch/sparc/include/asm/ptrace.h b/arch/sparc/include/asm/ptrace.h
> index d1419e6690274..8adf3fd2f00fe 100644
> --- a/arch/sparc/include/asm/ptrace.h
> +++ b/arch/sparc/include/asm/ptrace.h
> @@ -5,7 +5,7 @@
> #include <uapi/asm/ptrace.h>
>
> #if defined(__sparc__) && defined(__arch64__)
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/compiler.h>
> #include <linux/threads.h>
> @@ -113,10 +113,10 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)
> {
> return regs->u_regs[UREG_I6];
> }
> -#else /* __ASSEMBLY__ */
> -#endif /* __ASSEMBLY__ */
> +#else /* __ASSEMBLER__ */
> +#endif /* __ASSEMBLER__ */
> #else /* (defined(__sparc__) && defined(__arch64__)) */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/switch_to.h>
>
> static inline bool pt_regs_is_syscall(struct pt_regs *regs)
> @@ -144,8 +144,8 @@ static inline bool pt_regs_clear_syscall(struct pt_regs *regs)
> #define instruction_pointer(regs) ((regs)->pc)
> #define user_stack_pointer(regs) ((regs)->u_regs[UREG_FP])
> unsigned long profile_pc(struct pt_regs *);
> -#else /* (!__ASSEMBLY__) */
> -#endif /* (!__ASSEMBLY__) */
> +#else /* (!__ASSEMBLER__) */
> +#endif /* (!__ASSEMBLER__) */
> #endif /* (defined(__sparc__) && defined(__arch64__)) */
> #define STACK_BIAS 2047
>
> diff --git a/arch/sparc/include/asm/ross.h b/arch/sparc/include/asm/ross.h
> index 79a54d66a2c0b..53a42b37495d0 100644
> --- a/arch/sparc/include/asm/ross.h
> +++ b/arch/sparc/include/asm/ross.h
> @@ -95,7 +95,7 @@
> #define HYPERSPARC_ICCR_FTD 0x00000002
> #define HYPERSPARC_ICCR_ICE 0x00000001
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline unsigned int get_ross_icr(void)
> {
> @@ -187,6 +187,6 @@ static inline void hyper_flush_cache_page(unsigned long page)
> }
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(_SPARC_ROSS_H) */
> diff --git a/arch/sparc/include/asm/sbi.h b/arch/sparc/include/asm/sbi.h
> index 4d6026c1e446f..861f85b5bf9bb 100644
> --- a/arch/sparc/include/asm/sbi.h
> +++ b/arch/sparc/include/asm/sbi.h
> @@ -64,7 +64,7 @@ struct sbi_regs {
> */
>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline int acquire_sbi(int devid, int mask)
> {
> @@ -111,6 +111,6 @@ static inline void set_sbi_ctl(int devid, int cfgno, int cfg)
> "i" (ASI_M_CTL));
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_SBI_H) */
> diff --git a/arch/sparc/include/asm/sigcontext.h b/arch/sparc/include/asm/sigcontext.h
> index ee05f9d2bcf2c..200f95144fd29 100644
> --- a/arch/sparc/include/asm/sigcontext.h
> +++ b/arch/sparc/include/asm/sigcontext.h
> @@ -5,7 +5,7 @@
> #include <asm/ptrace.h>
> #include <uapi/asm/sigcontext.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __SUNOS_MAXWIN 31
>
> @@ -104,6 +104,6 @@ typedef struct {
> #endif /* (CONFIG_SPARC64) */
>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC_SIGCONTEXT_H) */
> diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h
> index 28f81081e37da..d93fe93544ec6 100644
> --- a/arch/sparc/include/asm/signal.h
> +++ b/arch/sparc/include/asm/signal.h
> @@ -2,16 +2,16 @@
> #ifndef __SPARC_SIGNAL_H
> #define __SPARC_SIGNAL_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <linux/personality.h>
> #include <linux/types.h>
> #endif
> #include <uapi/asm/signal.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define __ARCH_HAS_KA_RESTORER
> #define __ARCH_HAS_SA_RESTORER
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
> #endif /* !(__SPARC_SIGNAL_H) */
> diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h
> index 2cf7971d7f6c9..9c6ed98fbaf12 100644
> --- a/arch/sparc/include/asm/smp_32.h
> +++ b/arch/sparc/include/asm/smp_32.h
> @@ -10,15 +10,15 @@
> #include <linux/threads.h>
> #include <asm/head.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/cpumask.h>
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #ifdef CONFIG_SMP
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/asi.h>
> @@ -105,7 +105,7 @@ int hard_smp_processor_id(void);
>
> void smp_setup_cpu_possible_map(void);
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* Sparc specific messages. */
> #define MSG_CROSS_CALL 0x0005 /* run func on cpus */
> diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h
> index 0964fede0b2cc..759fb4a9530ed 100644
> --- a/arch/sparc/include/asm/smp_64.h
> +++ b/arch/sparc/include/asm/smp_64.h
> @@ -12,16 +12,16 @@
> #include <asm/starfire.h>
> #include <asm/spitfire.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <linux/cpumask.h>
> #include <linux/cache.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #ifdef CONFIG_SMP
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /*
> * Private routines/data
> @@ -68,7 +68,7 @@ int __cpu_disable(void);
> void __cpu_die(unsigned int cpu);
> #endif
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #else
>
> diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
> index bc5aa6f616764..6d6d261bf8d2f 100644
> --- a/arch/sparc/include/asm/spinlock_32.h
> +++ b/arch/sparc/include/asm/spinlock_32.h
> @@ -7,7 +7,7 @@
> #ifndef __SPARC_SPINLOCK_H
> #define __SPARC_SPINLOCK_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/psr.h>
> #include <asm/barrier.h>
> @@ -183,6 +183,6 @@ static inline int __arch_read_trylock(arch_rwlock_t *rw)
> res; \
> })
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* __SPARC_SPINLOCK_H */
> diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
> index 3a9a0b0c74654..13cd15d346be4 100644
> --- a/arch/sparc/include/asm/spinlock_64.h
> +++ b/arch/sparc/include/asm/spinlock_64.h
> @@ -7,13 +7,13 @@
> #ifndef __SPARC64_SPINLOCK_H
> #define __SPARC64_SPINLOCK_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/processor.h>
> #include <asm/barrier.h>
> #include <asm/qspinlock.h>
> #include <asm/qrwlock.h>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* !(__SPARC64_SPINLOCK_H) */
> diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
> index e9b7d25b29fae..79b9dd5e9ac68 100644
> --- a/arch/sparc/include/asm/spitfire.h
> +++ b/arch/sparc/include/asm/spitfire.h
> @@ -68,7 +68,7 @@
> #define CPU_ID_M8 ('8')
> #define CPU_ID_SONOMA1 ('N')
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> enum ultra_tlb_layout {
> spitfire = 0,
> @@ -363,6 +363,6 @@ static inline void cheetah_put_itlb_data(int entry, unsigned long data)
> "i" (ASI_ITLB_DATA_ACCESS));
> }
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
> #endif /* CONFIG_SPARC64 */
> #endif /* !(_SPARC64_SPITFIRE_H) */
> diff --git a/arch/sparc/include/asm/starfire.h b/arch/sparc/include/asm/starfire.h
> index fb1a8c499cb03..8e511ed787755 100644
> --- a/arch/sparc/include/asm/starfire.h
> +++ b/arch/sparc/include/asm/starfire.h
> @@ -8,7 +8,7 @@
> #ifndef _SPARC64_STARFIRE_H
> #define _SPARC64_STARFIRE_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> extern int this_is_starfire;
>
> diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
> index 45b4955b253f2..fdaf7b171e0ac 100644
> --- a/arch/sparc/include/asm/thread_info_32.h
> +++ b/arch/sparc/include/asm/thread_info_32.h
> @@ -14,7 +14,7 @@
>
> #ifdef __KERNEL__
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/page.h>
> @@ -72,7 +72,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
> */
> #define THREAD_SIZE_ORDER 1
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> /* Size of kernel stack for each process */
> #define THREAD_SIZE (2 * PAGE_SIZE)
> diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
> index 1a44372e2bc07..c8a73dff27f80 100644
> --- a/arch/sparc/include/asm/thread_info_64.h
> +++ b/arch/sparc/include/asm/thread_info_64.h
> @@ -26,7 +26,7 @@
>
> #include <asm/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/ptrace.h>
> #include <asm/types.h>
> @@ -64,7 +64,7 @@ struct thread_info {
> __attribute__ ((aligned(64)));
> };
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /* offsets into the thread_info struct for assembly code access */
> #define TI_TASK 0x00000000
> @@ -110,7 +110,7 @@ struct thread_info {
> /*
> * macros/functions for gaining access to the thread information structure
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define INIT_THREAD_INFO(tsk) \
> { \
> @@ -150,7 +150,7 @@ extern struct thread_info *current_thread_info(void);
> #define set_thread_fpdepth(val) (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_FPDEPTH] = (val))
> #define get_thread_wsaved() (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED])
> #define set_thread_wsaved(val) (__cur_thread_flag_byte_ptr[TI_FLAG_BYTE_WSAVED] = (val))
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> /*
> * Thread information flags, only 16 bits are available as we encode
> @@ -228,14 +228,14 @@ extern struct thread_info *current_thread_info(void);
> * Note that there are only 8 bits available.
> */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0)
> #define test_thread_64bit_stack(__SP) \
> ((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \
> false : true)
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* __KERNEL__ */
>
> diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
> index ace0d48e837e5..6cf2a60a0156d 100644
> --- a/arch/sparc/include/asm/trap_block.h
> +++ b/arch/sparc/include/asm/trap_block.h
> @@ -7,7 +7,7 @@
> #include <asm/hypervisor.h>
> #include <asm/asi.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* Trap handling code needs to get at a few critical values upon
> * trap entry and to process TSB misses. These cannot be in the
> @@ -91,7 +91,7 @@ extern struct sun4v_2insn_patch_entry __sun_m7_2insn_patch,
> __sun_m7_2insn_patch_end;
>
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #define TRAP_PER_CPU_THREAD 0x00
> #define TRAP_PER_CPU_PGD_PADDR 0x08
> diff --git a/arch/sparc/include/asm/traps.h b/arch/sparc/include/asm/traps.h
> index 2fba2602ba69c..e4e10b0e7887d 100644
> --- a/arch/sparc/include/asm/traps.h
> +++ b/arch/sparc/include/asm/traps.h
> @@ -9,7 +9,7 @@
>
> #include <uapi/asm/traps.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> /* This is for V8 compliant Sparc CPUS */
> struct tt_entry {
> unsigned long inst_one;
> @@ -21,5 +21,5 @@ struct tt_entry {
> /* We set this to _start in system setup. */
> extern struct tt_entry *sparc_ttable;
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
> #endif /* !(_SPARC_TRAPS_H) */
> diff --git a/arch/sparc/include/asm/tsb.h b/arch/sparc/include/asm/tsb.h
> index 522a677e050d7..239be259e1669 100644
> --- a/arch/sparc/include/asm/tsb.h
> +++ b/arch/sparc/include/asm/tsb.h
> @@ -59,7 +59,7 @@
> * The kernel TSB is locked into the TLB by virtue of being in the
> * kernel image, so we don't play these games for swapper_tsb access.
> */
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> struct tsb_ldquad_phys_patch_entry {
> unsigned int addr;
> unsigned int sun4u_insn;
> diff --git a/arch/sparc/include/asm/ttable.h b/arch/sparc/include/asm/ttable.h
> index 8f64694080198..b32d3068cce12 100644
> --- a/arch/sparc/include/asm/ttable.h
> +++ b/arch/sparc/include/asm/ttable.h
> @@ -5,7 +5,7 @@
> #include <asm/utrap.h>
> #include <asm/pil.h>
>
> -#ifdef __ASSEMBLY__
> +#ifdef __ASSEMBLER__
> #include <asm/thread_info.h>
> #endif
>
> diff --git a/arch/sparc/include/asm/turbosparc.h b/arch/sparc/include/asm/turbosparc.h
> index 23df777f9cea5..5f73263b6ded8 100644
> --- a/arch/sparc/include/asm/turbosparc.h
> +++ b/arch/sparc/include/asm/turbosparc.h
> @@ -57,7 +57,7 @@
> #define TURBOSPARC_WTENABLE 0x00000020 /* Write thru for dcache */
> #define TURBOSPARC_SNENABLE 0x40000000 /* DVMA snoop enable */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> /* Bits [13:5] select one of 512 instruction cache tags */
> static inline void turbosparc_inv_insn_tag(unsigned long addr)
> @@ -121,6 +121,6 @@ static inline unsigned long turbosparc_get_ccreg(void)
> return regval;
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_TURBOSPARC_H) */
> diff --git a/arch/sparc/include/asm/upa.h b/arch/sparc/include/asm/upa.h
> index 782691b30f545..b1df3a7f40ed0 100644
> --- a/arch/sparc/include/asm/upa.h
> +++ b/arch/sparc/include/asm/upa.h
> @@ -24,7 +24,7 @@
> #define UPA_PORTID_ID 0x000000000000ffff /* Module Identification bits */
>
> /* UPA I/O space accessors */
> -#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
> +#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
> static inline unsigned char _upa_readb(unsigned long addr)
> {
> unsigned char ret;
> @@ -105,6 +105,6 @@ static inline void _upa_writeq(unsigned long q, unsigned long addr)
> #define upa_writew(__w, __addr) (_upa_writew((__w), (unsigned long)(__addr)))
> #define upa_writel(__l, __addr) (_upa_writel((__l), (unsigned long)(__addr)))
> #define upa_writeq(__q, __addr) (_upa_writeq((__q), (unsigned long)(__addr)))
> -#endif /* __KERNEL__ && !__ASSEMBLY__ */
> +#endif /* __KERNEL__ && !__ASSEMBLER__ */
>
> #endif /* !(_SPARC64_UPA_H) */
> diff --git a/arch/sparc/include/asm/vaddrs.h b/arch/sparc/include/asm/vaddrs.h
> index 4fec0341e2a81..da567600c8974 100644
> --- a/arch/sparc/include/asm/vaddrs.h
> +++ b/arch/sparc/include/asm/vaddrs.h
> @@ -31,7 +31,7 @@
> */
> #define SRMMU_NOCACHE_ALCRATIO 64 /* 256 pages per 64MB of system RAM */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> #include <asm/kmap_size.h>
>
> enum fixed_addresses {
> diff --git a/arch/sparc/include/asm/viking.h b/arch/sparc/include/asm/viking.h
> index 08ffc605035f3..bbb714de43c42 100644
> --- a/arch/sparc/include/asm/viking.h
> +++ b/arch/sparc/include/asm/viking.h
> @@ -110,7 +110,7 @@
> #define VIKING_PTAG_DIRTY 0x00010000 /* Block has been modified */
> #define VIKING_PTAG_SHARED 0x00000100 /* Shared with some other cache */
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> static inline void viking_flush_icache(void)
> {
> @@ -250,6 +250,6 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr)
> return val;
> }
>
> -#endif /* !__ASSEMBLY__ */
> +#endif /* !__ASSEMBLER__ */
>
> #endif /* !(_SPARC_VIKING_H) */
> diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h
> index 7903e84e09e05..71eb4e9afb3e0 100644
> --- a/arch/sparc/include/asm/visasm.h
> +++ b/arch/sparc/include/asm/visasm.h
> @@ -45,7 +45,7 @@
> #define VISExitHalfFast \
> wr %o5, 0, %fprs;
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> static inline void save_and_clear_fpu(void) {
> __asm__ __volatile__ (
> " rd %%fprs, %%o5\n"
> diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h
> index 9a870f5dc3712..7612f15a261fe 100644
> --- a/drivers/char/hw_random/n2rng.h
> +++ b/drivers/char/hw_random/n2rng.h
> @@ -48,7 +48,7 @@
>
> #define HV_RNG_NUM_CONTROL 4
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
> extern unsigned long sun4v_rng_get_diag_ctl(void);
> extern unsigned long sun4v_rng_ctl_read_v1(unsigned long ctl_regs_ra,
> unsigned long *state,
> @@ -147,6 +147,6 @@ struct n2rng {
> #define N2RNG_BUSY_LIMIT 100
> #define N2RNG_HCHECK_LIMIT 100
>
> -#endif /* !(__ASSEMBLY__) */
> +#endif /* !(__ASSEMBLER__) */
>
> #endif /* _N2RNG_H */
This causes the kernel build to fail:
CC [M] drivers/gpu/drm/nouveau/nv04_fence.o
CC [M] drivers/gpu/drm/nouveau/nv10_fence.o
CC [M] drivers/gpu/drm/nouveau/nv17_fence.o
CC [M] drivers/gpu/drm/nouveau/nv50_fence.o
CC [M] drivers/gpu/drm/nouveau/nv84_fence.o
CC [M] drivers/gpu/drm/nouveau/nvc0_fence.o
LD [M] drivers/gpu/drm/nouveau/nouveau.o
AR drivers/gpu/built-in.a
AR drivers/built-in.a
make: *** [Makefile:2026: .] Error 2
glaubitz@node54:/data/home/glaubitz/linux> make
CALL scripts/checksyscalls.sh
<stdin>:1519:2: warning: #warning syscall clone3 not implemented [-Wcpp]
AS arch/sparc/kernel/head_64.o
./arch/sparc/include/uapi/asm/ptrace.h: Assembler messages:
./arch/sparc/include/uapi/asm/ptrace.h:22: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:23: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:24: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:25: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:26: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:27: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:40: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:41: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/ptrace.h:43: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:44: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:45: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:46: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:47: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:48: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:49: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/ptrace.h:52: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:53: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:54: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:55: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/ptrace.h:58: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:59: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:60: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:61: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/ptrace.h:64: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:65: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:66: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:67: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:68: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:69: Error: Unknown opcode: `char'
./arch/sparc/include/uapi/asm/ptrace.h:70: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:71: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:72: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/ptrace.h:75: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:76: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:77: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:78: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:79: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:80: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:81: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:82: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:83: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/ptrace.h:85: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:86: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:87: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:88: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/ptrace.h:89: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/ptrace.h:90: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/signal.h:110: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/signal.h:112: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/signal.h:113: Error: Unknown opcode: `unsigned'
./arch/sparc/include/uapi/asm/signal.h:114: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/signal.h:117: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/signal.h:119: Error: Unknown opcode: `char'
./arch/sparc/include/uapi/asm/signal.h:120: Error: Unknown opcode: `int'
./arch/sparc/include/uapi/asm/signal.h:121: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/posix_types.h:14: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/posix_types.h:15: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/posix_types.h:19: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/posix_types.h:22: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/posix_types.h:23: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/posix_types.h:26: Error: Unknown opcode: `struct'
./arch/sparc/include/uapi/asm/posix_types.h:27: Error: Unknown opcode: `__kernel_long_t tv_sec'
./arch/sparc/include/uapi/asm/posix_types.h:28: Error: Unknown opcode: `__kernel_suseconds_t tv_usec'
./arch/sparc/include/uapi/asm/posix_types.h:29: Error: junk at end of line, first unrecognized character is `}'
./include/uapi/asm-generic/posix_types.h:20: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:24: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:28: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:32: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:36: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:37: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:45: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:49: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:50: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:59: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:72: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:73: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:74: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:79: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:80: Error: Unknown opcode: `int'
./include/uapi/asm-generic/posix_types.h:81: Error: junk at end of line, first unrecognized character is `}'
./include/uapi/asm-generic/posix_types.h:87: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:88: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:89: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:93: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:94: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:95: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:96: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:97: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:98: Error: Unknown opcode: `typedef'
./include/uapi/asm-generic/posix_types.h:99: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/signal.h:172: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/signal.h:173: Error: Unknown opcode: `void'
./arch/sparc/include/uapi/asm/signal.h:174: Error: Unknown opcode: `int'
./arch/sparc/include/uapi/asm/signal.h:175: Error: Unknown opcode: `__kernel_size_t ss_size'
./arch/sparc/include/uapi/asm/signal.h:176: Error: junk at end of line, first unrecognized character is `}'
./arch/sparc/include/uapi/asm/utrap.h:48: Error: Unknown opcode: `typedef'
./arch/sparc/include/uapi/asm/utrap.h:49: Error: Unknown opcode: `typedef'
arch/sparc/kernel/head_64.S:709: Error: found '(', expected: ')'
arch/sparc/kernel/head_64.S:709: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:41: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:48: Error: found '(', expected: ')'
arch/sparc/kernel/etrap_64.S:48: Error: Expression inside %hi could not be parsed
arch/sparc/kernel/etrap_64.S:50: Error: found '(', expected: ')'
arch/sparc/kernel/etrap_64.S:50: Error: Expression inside %lo could not be parsed
arch/sparc/kernel/etrap_64.S:57: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:59: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:61: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:63: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:66: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:144: Error: found '(', expected: ')'
arch/sparc/kernel/etrap_64.S:144: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:145: Error: found '(', expected: ')'
(...)
arch/sparc/kernel/ttable_64.S:243: Error: Illegal operands
arch/sparc/kernel/ttable_64.S:243: Error: found '(', expected: ')'
arch/sparc/kernel/ttable_64.S:243: Error: Illegal operands
arch/sparc/kernel/ttable_64.S:243: Error: found '(', expected: ')'
arch/sparc/kernel/ttable_64.S:243: Error: Illegal operands
arch/sparc/kernel/etrap_64.S:48: Error: can't resolve L0 - sizeof
arch/sparc/kernel/etrap_64.S:50: Error: can't resolve L0 - sizeof
make[3]: *** [scripts/Makefile.build:374: arch/sparc/kernel/head_64.o] Error 1
make[2]: *** [scripts/Makefile.build:494: arch/sparc/kernel] Error 2
make[1]: *** [scripts/Makefile.build:494: arch/sparc] Error 2
make: *** [Makefile:2026: .] Error 2
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-08-03 13:33 ` John Paul Adrian Glaubitz
@ 2025-08-04 6:01 ` Thomas Huth
2025-08-04 8:00 ` Arnd Bergmann
2025-08-05 9:50 ` Thomas Huth
1 sibling, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-08-04 6:01 UTC (permalink / raw)
To: John Paul Adrian Glaubitz, linux-kernel
Cc: Arnd Bergmann, linux-arch, David S. Miller, Andreas Larsson,
sparclinux
On 03/08/2025 15.33, John Paul Adrian Glaubitz wrote:
> Hi Thomas,
>
> On Fri, 2025-03-14 at 08:10 +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).
...
> This causes the kernel build to fail:
>
> CC [M] drivers/gpu/drm/nouveau/nv04_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv10_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv17_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv50_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv84_fence.o
> CC [M] drivers/gpu/drm/nouveau/nvc0_fence.o
> LD [M] drivers/gpu/drm/nouveau/nouveau.o
> AR drivers/gpu/built-in.a
> AR drivers/built-in.a
> make: *** [Makefile:2026: .] Error 2
> glaubitz@node54:/data/home/glaubitz/linux> make
> CALL scripts/checksyscalls.sh
> <stdin>:1519:2: warning: #warning syscall clone3 not implemented [-Wcpp]
> AS arch/sparc/kernel/head_64.o
> ./arch/sparc/include/uapi/asm/ptrace.h: Assembler messages:
> ./arch/sparc/include/uapi/asm/ptrace.h:22: Error: Unknown opcode: `struct'
> ./arch/sparc/include/uapi/asm/ptrace.h:23: Error: Unknown opcode: `unsigned'
[...]
D'oh! I guess it's because sparc is using "asflags-y := -ansi" in it's
Makefiles ? -ansi seems to change the behavior of the compiler so that
__ASSEMBLER__ does not get defined anymore :-(
Do you know why sparc uses "-ansi" for the assembler files? I just tried to
install the latest sparc64-linux-gnu-gcc on Fedora 42, and when I try to
compile the kernel with that one, I even get earlier errors related to that
flag:
AS arch/sparc/kernel/head_64.o
In file included from ./include/linux/atomic.h:80,
from ./include/asm-generic/bitops/lock.h:5,
from ./arch/sparc/include/asm/bitops_64.h:52,
from ./arch/sparc/include/asm/bitops.h:5,
from ./include/linux/bitops.h:67,
from ./include/linux/log2.h:12,
from ./include/asm-generic/getorder.h:8,
from ./arch/sparc/include/asm/page_64.h:158,
from ./arch/sparc/include/asm/page.h:6,
from ./arch/sparc/include/asm/pgtable_64.h:23,
from ./arch/sparc/include/asm/pgtable.h:5,
from ./include/linux/pgtable.h:6,
from arch/sparc/kernel/head_64.S:16:
./include/linux/atomic/atomic-arch-fallback.h:1:1: error: C++ style comments
are not allowed in ISO C90
1 | // SPDX-License-Identifier: GPL-2.0
| ^
./include/linux/atomic/atomic-arch-fallback.h:1:1: note: (this will be
reported only once per input file)
In file included from ./include/linux/atomic.h:81:
./include/linux/atomic/atomic-long.h:1:1: error: C++ style comments are not
allowed in ISO C90
1 | // SPDX-License-Identifier: GPL-2.0
| ^
./include/linux/atomic/atomic-long.h:1:1: note: (this will be reported only
once per input file)
In file included from ./include/linux/atomic.h:82:
./include/linux/atomic/atomic-instrumented.h:1:1: error: C++ style comments
are not allowed in ISO C90
1 | // SPDX-License-Identifier: GPL-2.0
| ^
etc.
So using -ansi in the kernel sources nowadays sounds wrong to me ... could
it be removed?
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-08-04 6:01 ` Thomas Huth
@ 2025-08-04 8:00 ` Arnd Bergmann
2025-08-04 18:04 ` David Laight
0 siblings, 1 reply; 94+ messages in thread
From: Arnd Bergmann @ 2025-08-04 8:00 UTC (permalink / raw)
To: Thomas Huth, John Paul Adrian Glaubitz, linux-kernel
Cc: Linux-Arch, David S . Miller, Andreas Larsson, sparclinux
On Mon, Aug 4, 2025, at 08:01, Thomas Huth wrote:
> On 03/08/2025 15.33, John Paul Adrian Glaubitz wrote:
>
> So using -ansi in the kernel sources nowadays sounds wrong to me ... could
> it be removed?
Probably: I see that sparc changed '-traditional' cpp flag to the '-ansi'
gcc flag in linux-2.1.88, while the others were still using
-traditional but just dropped it later.
Most likely the idea at the time was to just no longer use pre-ansi
preprocessing rather than to exclude gnu extensions.
Arnd
^ permalink raw reply [flat|nested] 94+ messages in thread* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-08-04 8:00 ` Arnd Bergmann
@ 2025-08-04 18:04 ` David Laight
0 siblings, 0 replies; 94+ messages in thread
From: David Laight @ 2025-08-04 18:04 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Thomas Huth, John Paul Adrian Glaubitz, linux-kernel, Linux-Arch,
David S . Miller, Andreas Larsson, sparclinux
On Mon, 04 Aug 2025 10:00:27 +0200
"Arnd Bergmann" <arnd@arndb.de> wrote:
> On Mon, Aug 4, 2025, at 08:01, Thomas Huth wrote:
> > On 03/08/2025 15.33, John Paul Adrian Glaubitz wrote:
>
> >
> > So using -ansi in the kernel sources nowadays sounds wrong to me ... could
> > it be removed?
>
> Probably: I see that sparc changed '-traditional' cpp flag to the '-ansi'
> gcc flag in linux-2.1.88, while the others were still using
> -traditional but just dropped it later.
>
> Most likely the idea at the time was to just no longer use pre-ansi
> preprocessing rather than to exclude gnu extensions.
You also get a change to the integer promotion rules.
K&R C is signedness preserving (so unsigned char -> unsigned int)
whereas ANSI C is value preserving (so unsigned char -> signed int).
Unless, of course 'char' and 'int' are the same size.
David
>
> Arnd
>
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-08-03 13:33 ` John Paul Adrian Glaubitz
2025-08-04 6:01 ` Thomas Huth
@ 2025-08-05 9:50 ` Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-08-05 9:50 UTC (permalink / raw)
To: John Paul Adrian Glaubitz, linux-kernel
Cc: Arnd Bergmann, linux-arch, David S. Miller, Andreas Larsson,
sparclinux
On 03/08/2025 15.33, John Paul Adrian Glaubitz wrote:
> Hi Thomas,
>
> On Fri, 2025-03-14 at 08:10 +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 causes the kernel build to fail:
>
> CC [M] drivers/gpu/drm/nouveau/nv04_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv10_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv17_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv50_fence.o
> CC [M] drivers/gpu/drm/nouveau/nv84_fence.o
> CC [M] drivers/gpu/drm/nouveau/nvc0_fence.o
> LD [M] drivers/gpu/drm/nouveau/nouveau.o
> AR drivers/gpu/built-in.a
> AR drivers/built-in.a
> make: *** [Makefile:2026: .] Error 2
> glaubitz@node54:/data/home/glaubitz/linux> make
> CALL scripts/checksyscalls.sh
> <stdin>:1519:2: warning: #warning syscall clone3 not implemented [-Wcpp]
> AS arch/sparc/kernel/head_64.o
> ./arch/sparc/include/uapi/asm/ptrace.h: Assembler messages:
> ./arch/sparc/include/uapi/asm/ptrace.h:22: Error: Unknown opcode: `struct'
Hi Adrian,
could you please give it another try, after applying this patch first:
https://lore.kernel.org/lkml/20250805092540.48334-1-thuth@redhat.com/
Thanks,
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:10 ` [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
2025-06-06 7:22 ` Thomas Huth
2025-08-03 13:33 ` John Paul Adrian Glaubitz
@ 2025-09-26 15:04 ` Andreas Larsson
2 siblings, 0 replies; 94+ messages in thread
From: Andreas Larsson @ 2025-09-26 15:04 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, David S. Miller, sparclinux
On 2025-03-14 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: "David S. Miller" <davem@davemloft.net>
> Cc: Andreas Larsson <andreas@gaisler.com>
> Cc: sparclinux@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Andreas Larsson <andreas@gaisler.com>
Picking this up to my for-next.
Thanks,
Andreas
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (33 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 34/41] sparc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-18 9:59 ` Johannes Berg
2025-06-06 7:27 ` Thomas Huth
2025-03-14 7:10 ` [PATCH 36/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (5 subsequent siblings)
40 siblings, 2 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Richard Weinberger,
Anton Ivanov, Johannes Berg, linux-um
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, 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: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-um@lists.infradead.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/um/include/asm/cpufeature.h | 4 ++--
arch/um/include/asm/current.h | 4 ++--
arch/um/include/asm/page.h | 4 ++--
arch/um/include/asm/ptrace-generic.h | 2 +-
arch/um/include/asm/thread_info.h | 2 +-
arch/um/include/shared/as-layout.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/um/include/asm/cpufeature.h b/arch/um/include/asm/cpufeature.h
index 1eb8b834fbec3..4354f6984271c 100644
--- a/arch/um/include/asm/cpufeature.h
+++ b/arch/um/include/asm/cpufeature.h
@@ -4,7 +4,7 @@
#include <asm/processor.h>
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
#include <asm/asm.h>
#include <linux/bitops.h>
@@ -137,5 +137,5 @@ static __always_inline bool _static_cpu_has(u16 bit)
#define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \
boot_cpu_data.x86_model
-#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
+#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */
#endif /* _ASM_UM_CPUFEATURE_H */
diff --git a/arch/um/include/asm/current.h b/arch/um/include/asm/current.h
index de64e032d66c1..8accc6d6f5026 100644
--- a/arch/um/include/asm/current.h
+++ b/arch/um/include/asm/current.h
@@ -5,7 +5,7 @@
#include <linux/compiler.h>
#include <linux/threads.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
extern struct task_struct *cpu_tasks[NR_CPUS];
@@ -18,6 +18,6 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_CURRENT_H */
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
index 3d516f3ca9c74..6f54254aaf443 100644
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -11,7 +11,7 @@
#include <vdso/page.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct page;
@@ -94,7 +94,7 @@ extern unsigned long uml_physmem;
#include <asm-generic/memory_model.h>
#include <asm-generic/getorder.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_X86_32
#define __HAVE_ARCH_GATE_AREA 1
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h
index 4696f24d14920..86d74f9d33cf2 100644
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
@@ -6,7 +6,7 @@
#ifndef __UM_PTRACE_GENERIC_H
#define __UM_PTRACE_GENERIC_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <sysdep/ptrace.h>
diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h
index f9ad06fcc991a..398e86fe3d051 100644
--- a/arch/um/include/asm/thread_info.h
+++ b/arch/um/include/asm/thread_info.h
@@ -9,7 +9,7 @@
#define THREAD_SIZE_ORDER CONFIG_KERNEL_STACK_ORDER
#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/types.h>
#include <asm/page.h>
diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h
index ea65f151bf484..07721d7210b1f 100644
--- a/arch/um/include/shared/as-layout.h
+++ b/arch/um/include/shared/as-layout.h
@@ -26,7 +26,7 @@
#define STUB_DATA_PAGES 2 /* must be a power of two */
#define STUB_END (STUB_DATA + STUB_DATA_PAGES * UM_KERN_PAGE_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <sysdep/ptrace.h>
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers
2025-03-14 7:10 ` [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers Thomas Huth
@ 2025-03-18 9:59 ` Johannes Berg
2025-06-06 7:27 ` Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: Johannes Berg @ 2025-03-18 9:59 UTC (permalink / raw)
To: Thomas Huth, linux-kernel
Cc: Arnd Bergmann, linux-arch, Richard Weinberger, Anton Ivanov,
linux-um
On Fri, 2025-03-14 at 08:10 +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, 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).
>
Looks fine, I guess - I'll assume that since it's part of a larger
series you'll merge it elsewhere.
johannes
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers
2025-03-14 7:10 ` [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers Thomas Huth
2025-03-18 9:59 ` Johannes Berg
@ 2025-06-06 7:27 ` Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-06-06 7:27 UTC (permalink / raw)
To: Richard Weinberger, Anton Ivanov, Johannes Berg; +Cc: linux-um
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, 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: Richard Weinberger <richard@nod.at>
> Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: linux-um@lists.infradead.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> arch/um/include/asm/cpufeature.h | 4 ++--
> arch/um/include/asm/current.h | 4 ++--
> arch/um/include/asm/page.h | 4 ++--
> arch/um/include/asm/ptrace-generic.h | 2 +-
> arch/um/include/asm/thread_info.h | 2 +-
> arch/um/include/shared/as-layout.h | 2 +-
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/um/include/asm/cpufeature.h b/arch/um/include/asm/cpufeature.h
> index 1eb8b834fbec3..4354f6984271c 100644
> --- a/arch/um/include/asm/cpufeature.h
> +++ b/arch/um/include/asm/cpufeature.h
> @@ -4,7 +4,7 @@
>
> #include <asm/processor.h>
>
> -#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
> +#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
>
> #include <asm/asm.h>
> #include <linux/bitops.h>
> @@ -137,5 +137,5 @@ static __always_inline bool _static_cpu_has(u16 bit)
> #define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \
> boot_cpu_data.x86_model
>
> -#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
> +#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */
> #endif /* _ASM_UM_CPUFEATURE_H */
> diff --git a/arch/um/include/asm/current.h b/arch/um/include/asm/current.h
> index de64e032d66c1..8accc6d6f5026 100644
> --- a/arch/um/include/asm/current.h
> +++ b/arch/um/include/asm/current.h
> @@ -5,7 +5,7 @@
> #include <linux/compiler.h>
> #include <linux/threads.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct task_struct;
> extern struct task_struct *cpu_tasks[NR_CPUS];
> @@ -18,6 +18,6 @@ static __always_inline struct task_struct *get_current(void)
>
> #define current get_current()
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #endif /* __ASM_CURRENT_H */
> diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
> index 3d516f3ca9c74..6f54254aaf443 100644
> --- a/arch/um/include/asm/page.h
> +++ b/arch/um/include/asm/page.h
> @@ -11,7 +11,7 @@
>
> #include <vdso/page.h>
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> struct page;
>
> @@ -94,7 +94,7 @@ extern unsigned long uml_physmem;
> #include <asm-generic/memory_model.h>
> #include <asm-generic/getorder.h>
>
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>
> #ifdef CONFIG_X86_32
> #define __HAVE_ARCH_GATE_AREA 1
> diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h
> index 4696f24d14920..86d74f9d33cf2 100644
> --- a/arch/um/include/asm/ptrace-generic.h
> +++ b/arch/um/include/asm/ptrace-generic.h
> @@ -6,7 +6,7 @@
> #ifndef __UM_PTRACE_GENERIC_H
> #define __UM_PTRACE_GENERIC_H
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <sysdep/ptrace.h>
>
> diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h
> index f9ad06fcc991a..398e86fe3d051 100644
> --- a/arch/um/include/asm/thread_info.h
> +++ b/arch/um/include/asm/thread_info.h
> @@ -9,7 +9,7 @@
> #define THREAD_SIZE_ORDER CONFIG_KERNEL_STACK_ORDER
> #define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <asm/types.h>
> #include <asm/page.h>
> diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h
> index ea65f151bf484..07721d7210b1f 100644
> --- a/arch/um/include/shared/as-layout.h
> +++ b/arch/um/include/shared/as-layout.h
> @@ -26,7 +26,7 @@
> #define STUB_DATA_PAGES 2 /* must be a power of two */
> #define STUB_END (STUB_DATA + STUB_DATA_PAGES * UM_KERN_PAGE_SIZE)
>
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>
> #include <sysdep/ptrace.h>
>
Friendly ping!
Richard, Anton, Johannes, could you maybe pick this patch up via your "um"
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
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 36/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (34 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 35/41] um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 7:10 ` [PATCH 37/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (4 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, Dave Hansen, H. Peter Anvin, x86
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/x86/include/uapi/asm/bootparam.h | 4 ++--
arch/x86/include/uapi/asm/e820.h | 4 ++--
arch/x86/include/uapi/asm/ldt.h | 4 ++--
arch/x86/include/uapi/asm/msr.h | 4 ++--
arch/x86/include/uapi/asm/ptrace-abi.h | 6 +++---
arch/x86/include/uapi/asm/ptrace.h | 4 ++--
arch/x86/include/uapi/asm/setup_data.h | 4 ++--
arch/x86/include/uapi/asm/signal.h | 8 ++++----
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index 9b82eebd7add5..dafbf581c515d 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -26,7 +26,7 @@
#define XLF_5LEVEL_ENABLED (1<<6)
#define XLF_MEM_ENCRYPTION (1<<7)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/screen_info.h>
@@ -210,6 +210,6 @@ enum x86_hardware_subarch {
X86_NR_SUBARCHS,
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_BOOTPARAM_H */
diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
index 2f491efe3a126..55bc668671560 100644
--- a/arch/x86/include/uapi/asm/e820.h
+++ b/arch/x86/include/uapi/asm/e820.h
@@ -54,7 +54,7 @@
*/
#define E820_RESERVED_KERN 128
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
struct e820entry {
__u64 addr; /* start of memory segment */
@@ -76,7 +76,7 @@ struct e820map {
#define BIOS_ROM_BASE 0xffe00000
#define BIOS_ROM_END 0xffffffff
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_X86_E820_H */
diff --git a/arch/x86/include/uapi/asm/ldt.h b/arch/x86/include/uapi/asm/ldt.h
index d62ac5db093b4..a82c039d8e6a7 100644
--- a/arch/x86/include/uapi/asm/ldt.h
+++ b/arch/x86/include/uapi/asm/ldt.h
@@ -12,7 +12,7 @@
/* The size of each LDT entry. */
#define LDT_ENTRY_SIZE 8
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Note on 64bit base and limit is ignored and you cannot set DS/ES/CS
* not to the default values if you still want to do syscalls. This
@@ -44,5 +44,5 @@ struct user_desc {
#define MODIFY_LDT_CONTENTS_STACK 1
#define MODIFY_LDT_CONTENTS_CODE 2
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_LDT_H */
diff --git a/arch/x86/include/uapi/asm/msr.h b/arch/x86/include/uapi/asm/msr.h
index e7516b402a00f..4b8917ca28fe7 100644
--- a/arch/x86/include/uapi/asm/msr.h
+++ b/arch/x86/include/uapi/asm/msr.h
@@ -2,7 +2,7 @@
#ifndef _UAPI_ASM_X86_MSR_H
#define _UAPI_ASM_X86_MSR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/ioctl.h>
@@ -10,5 +10,5 @@
#define X86_IOC_RDMSR_REGS _IOWR('c', 0xA0, __u32[8])
#define X86_IOC_WRMSR_REGS _IOWR('c', 0xA1, __u32[8])
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_X86_MSR_H */
diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
index 16074b9c93bb5..5823584dea132 100644
--- a/arch/x86/include/uapi/asm/ptrace-abi.h
+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
@@ -25,7 +25,7 @@
#else /* __i386__ */
-#if defined(__ASSEMBLY__) || defined(__FRAME_OFFSETS)
+#if defined(__ASSEMBLER__) || defined(__FRAME_OFFSETS)
/*
* C ABI says these regs are callee-preserved. They aren't saved on kernel entry
* unless syscall needs a complete, fully filled "struct pt_regs".
@@ -57,7 +57,7 @@
#define EFLAGS 144
#define RSP 152
#define SS 160
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/* top of stack page */
#define FRAME_SIZE 168
@@ -87,7 +87,7 @@
#define PTRACE_SINGLEBLOCK 33 /* resume execution until next branch */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#endif
diff --git a/arch/x86/include/uapi/asm/ptrace.h b/arch/x86/include/uapi/asm/ptrace.h
index 85165c0edafc8..e0b5b4f6226b1 100644
--- a/arch/x86/include/uapi/asm/ptrace.h
+++ b/arch/x86/include/uapi/asm/ptrace.h
@@ -7,7 +7,7 @@
#include <asm/processor-flags.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __i386__
/* this struct defines the way the registers are stored on the
@@ -81,6 +81,6 @@ struct pt_regs {
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _UAPI_ASM_X86_PTRACE_H */
diff --git a/arch/x86/include/uapi/asm/setup_data.h b/arch/x86/include/uapi/asm/setup_data.h
index b111b0c185449..50c45ead4e7c9 100644
--- a/arch/x86/include/uapi/asm/setup_data.h
+++ b/arch/x86/include/uapi/asm/setup_data.h
@@ -18,7 +18,7 @@
#define SETUP_INDIRECT (1<<31)
#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -78,6 +78,6 @@ struct ima_setup_data {
__u64 size;
} __attribute__((packed));
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_X86_SETUP_DATA_H */
diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm/signal.h
index f777346450ec3..1067efabf18b5 100644
--- a/arch/x86/include/uapi/asm/signal.h
+++ b/arch/x86/include/uapi/asm/signal.h
@@ -2,7 +2,7 @@
#ifndef _UAPI_ASM_X86_SIGNAL_H
#define _UAPI_ASM_X86_SIGNAL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <linux/compiler.h>
@@ -16,7 +16,7 @@ struct siginfo;
typedef unsigned long sigset_t;
#endif /* __KERNEL__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define SIGHUP 1
@@ -68,7 +68,7 @@ typedef unsigned long sigset_t;
#include <asm-generic/signal-defs.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# ifndef __KERNEL__
@@ -106,6 +106,6 @@ typedef struct sigaltstack {
__kernel_size_t ss_size;
} stack_t;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_ASM_X86_SIGNAL_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 37/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (35 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 36/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 9:04 ` [tip: x86/merge] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers tip-bot2 for Thomas Huth
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Thomas Huth
2025-03-14 7:10 ` [PATCH 38/41] xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
` (3 subsequent siblings)
40 siblings, 2 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, Dave Hansen, H. Peter Anvin, x86
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 mostly a mechanical patch (done with a simple "sed -i"
statement), with some manual tweaks in arch/x86/include/asm/frame.h,
arch/x86/include/asm/hw_irq.h and arch/x86/include/asm/setup.h
that mentioned this macro in comments with some missing underscores.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/x86/boot/boot.h | 4 ++--
arch/x86/entry/vdso/extable.h | 2 +-
arch/x86/include/asm/alternative.h | 6 +++---
arch/x86/include/asm/asm.h | 10 +++++-----
arch/x86/include/asm/boot.h | 2 +-
arch/x86/include/asm/cpufeature.h | 4 ++--
arch/x86/include/asm/cpumask.h | 4 ++--
arch/x86/include/asm/current.h | 4 ++--
arch/x86/include/asm/desc_defs.h | 4 ++--
arch/x86/include/asm/dwarf2.h | 2 +-
arch/x86/include/asm/fixmap.h | 4 ++--
arch/x86/include/asm/frame.h | 10 +++++-----
arch/x86/include/asm/fred.h | 4 ++--
arch/x86/include/asm/fsgsbase.h | 4 ++--
arch/x86/include/asm/ftrace.h | 8 ++++----
arch/x86/include/asm/hw_irq.h | 4 ++--
arch/x86/include/asm/ibt.h | 12 ++++++------
arch/x86/include/asm/idtentry.h | 6 +++---
arch/x86/include/asm/inst.h | 2 +-
arch/x86/include/asm/irqflags.h | 10 +++++-----
arch/x86/include/asm/jump_label.h | 4 ++--
arch/x86/include/asm/kasan.h | 2 +-
arch/x86/include/asm/kexec.h | 4 ++--
arch/x86/include/asm/linkage.h | 6 +++---
arch/x86/include/asm/mem_encrypt.h | 4 ++--
arch/x86/include/asm/msr.h | 4 ++--
arch/x86/include/asm/nops.h | 2 +-
arch/x86/include/asm/nospec-branch.h | 6 +++---
arch/x86/include/asm/orc_types.h | 4 ++--
arch/x86/include/asm/page.h | 4 ++--
arch/x86/include/asm/page_32.h | 4 ++--
arch/x86/include/asm/page_32_types.h | 4 ++--
arch/x86/include/asm/page_64.h | 4 ++--
arch/x86/include/asm/page_64_types.h | 2 +-
arch/x86/include/asm/page_types.h | 4 ++--
arch/x86/include/asm/paravirt.h | 14 +++++++-------
arch/x86/include/asm/paravirt_types.h | 4 ++--
arch/x86/include/asm/percpu.h | 6 +++---
arch/x86/include/asm/pgtable-2level_types.h | 4 ++--
arch/x86/include/asm/pgtable-3level_types.h | 4 ++--
arch/x86/include/asm/pgtable-invert.h | 4 ++--
arch/x86/include/asm/pgtable.h | 12 ++++++------
arch/x86/include/asm/pgtable_32.h | 4 ++--
arch/x86/include/asm/pgtable_32_areas.h | 2 +-
arch/x86/include/asm/pgtable_64.h | 6 +++---
arch/x86/include/asm/pgtable_64_types.h | 4 ++--
arch/x86/include/asm/pgtable_types.h | 10 +++++-----
arch/x86/include/asm/prom.h | 4 ++--
arch/x86/include/asm/pti.h | 4 ++--
arch/x86/include/asm/ptrace.h | 4 ++--
arch/x86/include/asm/purgatory.h | 4 ++--
arch/x86/include/asm/pvclock-abi.h | 4 ++--
arch/x86/include/asm/realmode.h | 4 ++--
arch/x86/include/asm/segment.h | 8 ++++----
arch/x86/include/asm/setup.h | 6 +++---
arch/x86/include/asm/setup_data.h | 4 ++--
arch/x86/include/asm/shared/tdx.h | 4 ++--
arch/x86/include/asm/shstk.h | 4 ++--
arch/x86/include/asm/signal.h | 8 ++++----
arch/x86/include/asm/smap.h | 6 +++---
arch/x86/include/asm/smp.h | 4 ++--
arch/x86/include/asm/tdx.h | 4 ++--
arch/x86/include/asm/thread_info.h | 12 ++++++------
arch/x86/include/asm/unwind_hints.h | 4 ++--
arch/x86/include/asm/vdso/getrandom.h | 4 ++--
arch/x86/include/asm/vdso/gettimeofday.h | 4 ++--
arch/x86/include/asm/vdso/processor.h | 4 ++--
arch/x86/include/asm/vdso/vsyscall.h | 4 ++--
arch/x86/include/asm/xen/interface.h | 10 +++++-----
arch/x86/include/asm/xen/interface_32.h | 4 ++--
arch/x86/include/asm/xen/interface_64.h | 4 ++--
arch/x86/math-emu/control_w.h | 2 +-
arch/x86/math-emu/exception.h | 6 +++---
arch/x86/math-emu/fpu_emu.h | 6 +++---
arch/x86/math-emu/status_w.h | 6 +++---
arch/x86/realmode/rm/realmode.h | 4 ++--
arch/x86/realmode/rm/wakeup.h | 2 +-
tools/arch/x86/include/asm/asm.h | 8 ++++----
tools/arch/x86/include/asm/nops.h | 2 +-
tools/arch/x86/include/asm/orc_types.h | 4 ++--
tools/arch/x86/include/asm/pvclock-abi.h | 4 ++--
81 files changed, 202 insertions(+), 202 deletions(-)
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 0f24f7ebec9ba..38f17a1e1e367 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -16,7 +16,7 @@
#define STACK_SIZE 1024 /* Minimum number of bytes for stack */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stdarg.h>
#include <linux/types.h>
@@ -327,6 +327,6 @@ void probe_cards(int unsafe);
/* video-vesa.c */
void vesa_store_edid(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* BOOT_BOOT_H */
diff --git a/arch/x86/entry/vdso/extable.h b/arch/x86/entry/vdso/extable.h
index b56f6b0129416..baba612b832c3 100644
--- a/arch/x86/entry/vdso/extable.h
+++ b/arch/x86/entry/vdso/extable.h
@@ -7,7 +7,7 @@
* vDSO uses a dedicated handler the addresses are relative to the overall
* exception table, not each individual entry.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ASM_VDSO_EXTABLE_HANDLE(from, to) \
ASM_VDSO_EXTABLE_HANDLE from to
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index e3903b731305c..8e4fb4828e1bd 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -15,7 +15,7 @@
#define ALT_DIRECT_CALL(feature) ((ALT_FLAG_DIRECT_CALL << ALT_FLAGS_SHIFT) | (feature))
#define ALT_CALL_ALWAYS ALT_DIRECT_CALL(X86_FEATURE_ALWAYS)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stddef.h>
@@ -286,7 +286,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
void BUG_func(void);
void nop_func(void);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_SMP
.macro LOCK_PREFIX
@@ -369,6 +369,6 @@ void nop_func(void);
ALTERNATIVE_2 oldinstr, newinstr_no, X86_FEATURE_ALWAYS, \
newinstr_yes, ft_flags
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_ALTERNATIVE_H */
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 2bec0c89a95c2..e9653ee72813c 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __ASM_FORM(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__,
@@ -113,7 +113,7 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef __pic__
static __always_inline __pure void *rip_rel_ptr(void *p)
{
@@ -144,7 +144,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
# include <asm/extable_fixup_types.h>
/* Exception table entry */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define _ASM_EXTABLE_TYPE(from, to, type) \
.pushsection "__ex_table","a" ; \
@@ -164,7 +164,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
# define _ASM_NOKPROBE(entry)
# endif
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
# define DEFINE_EXTABLE_TYPE_REG \
".macro extable_type_reg type:req reg:req\n" \
@@ -221,7 +221,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define _ASM_EXTABLE(from, to) \
_ASM_EXTABLE_TYPE(from, to, EX_TYPE_DEFAULT)
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 3e5b111e619d4..3f02ff6d333d3 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -74,7 +74,7 @@
# define BOOT_STACK_SIZE 0x1000
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int output_len;
extern const unsigned long kernel_text_size;
extern const unsigned long kernel_total_size;
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index de1ad09fe8d72..7e67bacf02f37 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -4,7 +4,7 @@
#include <asm/processor.h>
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
#include <asm/asm.h>
#include <linux/bitops.h>
@@ -208,5 +208,5 @@ static __always_inline bool _static_cpu_has(u16 bit)
#define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \
boot_cpu_data.x86_model
-#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
+#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */
#endif /* _ASM_X86_CPUFEATURE_H */
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 4acfd57de8f1c..70f6b60ad67b9 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_CPUMASK_H
#define _ASM_X86_CPUMASK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
extern void setup_cpu_local_masks(void);
@@ -34,5 +34,5 @@ static __always_inline void arch_cpumask_clear_cpu(int cpu, struct cpumask *dstp
#define arch_cpu_is_offline(cpu) unlikely(!arch_cpu_online(cpu))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_CPUMASK_H */
diff --git a/arch/x86/include/asm/current.h b/arch/x86/include/asm/current.h
index bf5953883ec36..f2d0b38879808 100644
--- a/arch/x86/include/asm/current.h
+++ b/arch/x86/include/asm/current.h
@@ -5,7 +5,7 @@
#include <linux/build_bug.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/percpu.h>
@@ -51,6 +51,6 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_CURRENT_H */
diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
index d440a65af8f39..7e6b9314758a1 100644
--- a/arch/x86/include/asm/desc_defs.h
+++ b/arch/x86/include/asm/desc_defs.h
@@ -58,7 +58,7 @@
#define DESC_USER (_DESC_DPL(3))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -166,7 +166,7 @@ struct desc_ptr {
unsigned long address;
} __attribute__((packed)) ;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Boot IDT definitions */
#define BOOT_IDT_ENTRIES 32
diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index 430fca13bb568..302e11b15da86 100644
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_DWARF2_H
#define _ASM_X86_DWARF2_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#warning "asm/dwarf2.h should be only included in pure assembly files"
#endif
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index d0dcefb5cc59d..4519c9f35ba04 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -31,7 +31,7 @@
/* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */
#define FIXMAP_PMD_TOP 507
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kernel.h>
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -196,5 +196,5 @@ void __init *early_memremap_decrypted_wp(resource_size_t phys_addr,
void __early_set_fixmap(enum fixed_addresses idx,
phys_addr_t phys, pgprot_t flags);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_FIXMAP_H */
diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h
index fb42659f6e988..0ab65073c1cc0 100644
--- a/arch/x86/include/asm/frame.h
+++ b/arch/x86/include/asm/frame.h
@@ -11,7 +11,7 @@
#ifdef CONFIG_FRAME_POINTER
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro FRAME_BEGIN
push %_ASM_BP
@@ -51,7 +51,7 @@
.endm
#endif /* CONFIG_X86_64 */
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define FRAME_BEGIN \
"push %" _ASM_BP "\n" \
@@ -82,18 +82,18 @@ static inline unsigned long encode_frame_pointer(struct pt_regs *regs)
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define FRAME_OFFSET __ASM_SEL(4, 8)
#else /* !CONFIG_FRAME_POINTER */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ENCODE_FRAME_POINTER ptregs_offset=0
.endm
-#else /* !__ASSEMBLY */
+#else /* !__ASSEMBLER__ */
#define ENCODE_FRAME_POINTER
diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h
index 25ca00bd70e83..2a29e52168815 100644
--- a/arch/x86/include/asm/fred.h
+++ b/arch/x86/include/asm/fred.h
@@ -32,7 +32,7 @@
#define FRED_CONFIG_INT_STKLVL(l) (_AT(unsigned long, l) << 9)
#define FRED_CONFIG_ENTRYPOINT(p) _AT(unsigned long, (p))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_FRED
#include <linux/kernel.h>
@@ -113,6 +113,6 @@ static inline void fred_entry_from_kvm(unsigned int type, unsigned int vector) {
static inline void fred_sync_rsp0(unsigned long rsp0) { }
static inline void fred_update_rsp0(void) { }
#endif /* CONFIG_X86_FRED */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* ASM_X86_FRED_H */
diff --git a/arch/x86/include/asm/fsgsbase.h b/arch/x86/include/asm/fsgsbase.h
index 9e7e8ca8e2997..02f239569b93d 100644
--- a/arch/x86/include/asm/fsgsbase.h
+++ b/arch/x86/include/asm/fsgsbase.h
@@ -2,7 +2,7 @@
#ifndef _ASM_FSGSBASE_H
#define _ASM_FSGSBASE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_64
@@ -80,6 +80,6 @@ extern unsigned long x86_fsgsbase_read_task(struct task_struct *task,
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_FSGSBASE_H */
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index f9cb4d07df58f..2d02d5b0517c1 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -22,7 +22,7 @@
#define ARCH_SUPPORTS_FTRACE_OPS 1
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __fentry__(void);
static inline unsigned long ftrace_call_adjust(unsigned long addr)
@@ -118,11 +118,11 @@ struct dyn_arch_ftrace {
};
#endif /* CONFIG_DYNAMIC_FTRACE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_FUNCTION_TRACER */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void prepare_ftrace_return(unsigned long ip, unsigned long *parent,
unsigned long frame_pointer);
@@ -166,6 +166,6 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)
}
#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_IA32_EMULATION */
#endif /* !COMPILE_OFFSETS */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_FTRACE_H */
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index edebf1020e049..162ebd73a6981 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -16,7 +16,7 @@
#include <asm/irq_vectors.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/percpu.h>
#include <linux/profile.h>
@@ -128,6 +128,6 @@ extern char spurious_entries_start[];
typedef struct irq_desc* vector_irq_t[NR_VECTORS];
DECLARE_PER_CPU(vector_irq_t, vector_irq);
-#endif /* !ASSEMBLY_ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_HW_IRQ_H */
diff --git a/arch/x86/include/asm/ibt.h b/arch/x86/include/asm/ibt.h
index 1e59581d500ca..e7f4caa42839a 100644
--- a/arch/x86/include/asm/ibt.h
+++ b/arch/x86/include/asm/ibt.h
@@ -21,7 +21,7 @@
#define HAS_KERNEL_IBT 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_64
#define ASM_ENDBR "endbr64\n\t"
@@ -77,7 +77,7 @@ static inline bool is_endbr(u32 val)
extern __noendbr u64 ibt_save(bool disable);
extern __noendbr void ibt_restore(u64 save);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_X86_64
#define ENDBR endbr64
@@ -85,13 +85,13 @@ extern __noendbr void ibt_restore(u64 save);
#define ENDBR endbr32
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* !IBT */
#define HAS_KERNEL_IBT 0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define ASM_ENDBR
#define IBT_NOSEAL(name)
@@ -103,11 +103,11 @@ static inline bool is_endbr(u32 val) { return false; }
static inline u64 ibt_save(bool disable) { return 0; }
static inline void ibt_restore(u64 save) { }
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define ENDBR
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_X86_KERNEL_IBT */
diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
index ad5c68f0509d4..a4ec27c679887 100644
--- a/arch/x86/include/asm/idtentry.h
+++ b/arch/x86/include/asm/idtentry.h
@@ -7,7 +7,7 @@
#define IDT_ALIGN (8 * (1 + HAS_KERNEL_IBT))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/entry-common.h>
#include <linux/hardirq.h>
@@ -474,7 +474,7 @@ static inline void fred_install_sysvec(unsigned int vector, const idtentry_t fun
idt_install_sysvec(vector, asm_##function); \
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
/*
* The ASM variants for DECLARE_IDTENTRY*() which emit the ASM entry stubs.
@@ -579,7 +579,7 @@ SYM_CODE_START(spurious_entries_start)
SYM_CODE_END(spurious_entries_start)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* The actual entry points. Note that DECLARE_IDTENTRY*() serves two
diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h
index 438ccd4f3cc45..e48a00b3311d5 100644
--- a/arch/x86/include/asm/inst.h
+++ b/arch/x86/include/asm/inst.h
@@ -6,7 +6,7 @@
#ifndef X86_ASM_INST_H
#define X86_ASM_INST_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define REG_NUM_INVALID 100
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index cf7fc2b8e3ce1..abb8374c9ff7a 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -4,7 +4,7 @@
#include <asm/processor-flags.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/nospec-branch.h>
@@ -79,7 +79,7 @@ static __always_inline void native_local_irq_restore(unsigned long flags)
#ifdef CONFIG_PARAVIRT_XXL
#include <asm/paravirt.h>
#else
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
static __always_inline unsigned long arch_local_save_flags(void)
@@ -133,10 +133,10 @@ static __always_inline unsigned long arch_local_irq_save(void)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_PARAVIRT_XXL */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static __always_inline int arch_irqs_disabled_flags(unsigned long flags)
{
return !(flags & X86_EFLAGS_IF);
@@ -154,6 +154,6 @@ static __always_inline void arch_local_irq_restore(unsigned long flags)
if (!arch_irqs_disabled_flags(flags))
arch_local_irq_enable();
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index 3f1c1d6c0da12..61dd1dee7812e 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -7,7 +7,7 @@
#include <asm/asm.h>
#include <asm/nops.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
#include <linux/types.h>
@@ -55,6 +55,6 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke
extern int arch_jump_entry_size(struct jump_entry *entry);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h
index de75306b932ef..d7e33c7f096b0 100644
--- a/arch/x86/include/asm/kasan.h
+++ b/arch/x86/include/asm/kasan.h
@@ -23,7 +23,7 @@
(1ULL << (__VIRTUAL_MASK_SHIFT - \
KASAN_SHADOW_SCALE_SHIFT)))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_KASAN
void __init kasan_early_init(void);
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index 8ad187462b68e..c75509241ff28 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -13,7 +13,7 @@
# define KEXEC_CONTROL_PAGE_SIZE 4096
# define KEXEC_CONTROL_CODE_MAX_SIZE 2048
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/string.h>
#include <linux/kernel.h>
@@ -225,6 +225,6 @@ unsigned int arch_crash_get_elfcorehdr_size(void);
#define crash_get_elfcorehdr_size arch_crash_get_elfcorehdr_size
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_KEXEC_H */
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index dc31b13b87a0d..c95dad65801d5 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -38,7 +38,7 @@
#define ASM_FUNC_ALIGN __stringify(__FUNC_ALIGN)
#define SYM_F_ALIGN __FUNC_ALIGN
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
#define RET jmp __x86_return_thunk
@@ -50,7 +50,7 @@
#endif
#endif /* CONFIG_MITIGATION_RETPOLINE */
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
#define ASM_RET "jmp __x86_return_thunk\n\t"
@@ -62,7 +62,7 @@
#endif
#endif /* CONFIG_MITIGATION_RETPOLINE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Depending on -fpatchable-function-entry=N,N usage (CONFIG_CALL_PADDING) the
diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index f922b682b9b4c..1530ee301dfea 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -10,7 +10,7 @@
#ifndef __X86_MEM_ENCRYPT_H__
#define __X86_MEM_ENCRYPT_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/cc_platform.h>
@@ -114,6 +114,6 @@ void add_encrypt_protection_map(void);
extern char __start_bss_decrypted[], __end_bss_decrypted[], __start_bss_decrypted_unused[];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __X86_MEM_ENCRYPT_H__ */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 001853541f1e8..9397a319d165d 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -4,7 +4,7 @@
#include "msr-index.h"
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/asm.h>
#include <asm/errno.h>
@@ -397,5 +397,5 @@ static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
return wrmsr_safe_regs(regs);
}
#endif /* CONFIG_SMP */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_MSR_H */
diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h
index 1c1b7550fa550..cd94221d83358 100644
--- a/arch/x86/include/asm/nops.h
+++ b/arch/x86/include/asm/nops.h
@@ -82,7 +82,7 @@
#define ASM_NOP7 _ASM_BYTES(BYTES_NOP7)
#define ASM_NOP8 _ASM_BYTES(BYTES_NOP8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const unsigned char * const x86_nops[];
#endif
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index aee26bb8230f8..1dbc40080448d 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -177,7 +177,7 @@
add $(BITS_PER_LONG/8), %_ASM_SP; \
lfence;
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions
@@ -335,7 +335,7 @@
#define CLEAR_BRANCH_HISTORY_VMEXIT
#endif
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];
extern retpoline_thunk_t __x86_indirect_thunk_array[];
@@ -602,6 +602,6 @@ static __always_inline void mds_idle_clear_cpu_buffers(void)
mds_clear_cpu_buffers();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */
diff --git a/arch/x86/include/asm/orc_types.h b/arch/x86/include/asm/orc_types.h
index 46d7e06763c9f..e0125afa53fb9 100644
--- a/arch/x86/include/asm/orc_types.h
+++ b/arch/x86/include/asm/orc_types.h
@@ -45,7 +45,7 @@
#define ORC_TYPE_REGS 3
#define ORC_TYPE_REGS_PARTIAL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/byteorder.h>
/*
@@ -73,6 +73,6 @@ struct orc_entry {
#endif
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ORC_TYPES_H */
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index c9fe207916f48..9265f2fca99ae 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -14,7 +14,7 @@
#include <asm/page_32.h>
#endif /* CONFIG_X86_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct page;
@@ -84,7 +84,7 @@ static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits)
return __canonical_address(vaddr, vaddr_bits) == vaddr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <asm-generic/memory_model.h>
#include <asm-generic/getorder.h>
diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
index 580d71aca65a4..0c623706cb7ef 100644
--- a/arch/x86/include/asm/page_32.h
+++ b/arch/x86/include/asm/page_32.h
@@ -4,7 +4,7 @@
#include <asm/page_32_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET)
#ifdef CONFIG_DEBUG_VIRTUAL
@@ -26,6 +26,6 @@ static inline void copy_page(void *to, void *from)
{
memcpy(to, from, PAGE_SIZE);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_32_H */
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index faf9cc1c14bb6..88e3c8d582986 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -63,7 +63,7 @@
*/
#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This much address space is reserved for vmalloc() and iomap()
@@ -75,6 +75,6 @@ extern int sysctl_legacy_va_layout;
extern void find_low_pfn_range(void);
extern void setup_bootmem_allocator(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_32_DEFS_H */
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index d63576608ce76..442357defa117 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -4,7 +4,7 @@
#include <asm/page_64_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cpufeatures.h>
#include <asm/alternative.h>
@@ -94,7 +94,7 @@ static __always_inline unsigned long task_size_max(void)
}
#endif /* CONFIG_X86_5LEVEL */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_X86_VSYSCALL_EMULATION
# define __HAVE_ARCH_GATE_AREA 1
diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 06ef25411d622..1faa8f88850ab 100644
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PAGE_64_DEFS_H
#define _ASM_X86_PAGE_64_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/kaslr.h>
#endif
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 974688973cf6e..9f77bf03d7472 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -43,7 +43,7 @@
#define IOREMAP_MAX_ORDER (PMD_SHIFT)
#endif /* CONFIG_X86_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_DYNAMIC_PHYSICAL_MASK
extern phys_addr_t physical_mask;
@@ -66,6 +66,6 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);
extern void initmem_init(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_DEFS_H */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 041aff51eb50f..d784d26173461 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -6,7 +6,7 @@
#include <asm/paravirt_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
#endif
@@ -15,7 +15,7 @@ struct mm_struct;
#include <asm/asm.h>
#include <asm/nospec-branch.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <linux/types.h>
#include <linux/cpumask.h>
@@ -720,7 +720,7 @@ static __always_inline unsigned long arch_local_irq_save(void)
extern void default_banner(void);
void native_pv_lock_init(void) __init;
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_X86_64
#ifdef CONFIG_PARAVIRT_XXL
@@ -740,18 +740,18 @@ void native_pv_lock_init(void) __init;
#endif /* CONFIG_PARAVIRT_XXL */
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* CONFIG_PARAVIRT */
# define default_banner x86_init_noop
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void native_pv_lock_init(void)
{
}
#endif
#endif /* !CONFIG_PARAVIRT */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef CONFIG_PARAVIRT_XXL
static inline void paravirt_enter_mmap(struct mm_struct *mm)
{
@@ -769,5 +769,5 @@ static inline void paravirt_set_cap(void)
{
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PARAVIRT_H */
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index fea56b04f4365..4ec926518207a 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -4,7 +4,7 @@
#ifdef CONFIG_PARAVIRT
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/desc_defs.h>
@@ -519,7 +519,7 @@ unsigned long pv_native_read_cr2(void);
#define paravirt_nop ((void *)nop_func)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index e525cd85f999f..a1a4fb45274fb 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -10,7 +10,7 @@
# define __percpu_rel
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_SMP
# define __percpu %__percpu_seg:
@@ -26,7 +26,7 @@
# define INIT_PER_CPU_VAR(var) var
#endif
-#else /* !__ASSEMBLY__: */
+#else /* !__ASSEMBLER__: */
#include <linux/build_bug.h>
#include <linux/stringify.h>
@@ -619,7 +619,7 @@ do { \
/* We can use this directly for local CPU (faster). */
DECLARE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/pgtable-2level_types.h b/arch/x86/include/asm/pgtable-2level_types.h
index 4a12c276b1812..66425424ce91a 100644
--- a/arch/x86/include/asm/pgtable-2level_types.h
+++ b/arch/x86/include/asm/pgtable-2level_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PGTABLE_2LEVEL_DEFS_H
#define _ASM_X86_PGTABLE_2LEVEL_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
typedef unsigned long pteval_t;
@@ -16,7 +16,7 @@ typedef union {
pteval_t pte;
pteval_t pte_low;
} pte_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD 0
diff --git a/arch/x86/include/asm/pgtable-3level_types.h b/arch/x86/include/asm/pgtable-3level_types.h
index 80911349519e8..9d5b257d44e3c 100644
--- a/arch/x86/include/asm/pgtable-3level_types.h
+++ b/arch/x86/include/asm/pgtable-3level_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H
#define _ASM_X86_PGTABLE_3LEVEL_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
typedef u64 pteval_t;
@@ -25,7 +25,7 @@ typedef union {
};
pmdval_t pmd;
} pmd_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD (!static_cpu_has(X86_FEATURE_PTI))
diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h
index a0c1525f1b6f4..e12e52ae8083d 100644
--- a/arch/x86/include/asm/pgtable-invert.h
+++ b/arch/x86/include/asm/pgtable-invert.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PGTABLE_INVERT_H
#define _ASM_PGTABLE_INVERT_H 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* A clear pte value is special, and doesn't get inverted.
@@ -36,6 +36,6 @@ static inline u64 flip_protnone_guard(u64 oldval, u64 val, u64 mask)
return val;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 593f10aabd45a..7bd6bd6df4a11 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -15,7 +15,7 @@
cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS))) \
: (prot))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/spinlock.h>
#include <asm/x86_init.h>
#include <asm/pkru.h>
@@ -973,7 +973,7 @@ static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
}
#endif /* CONFIG_MITIGATION_PAGE_TABLE_ISOLATION */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_X86_32
@@ -982,7 +982,7 @@ static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
# include <asm/pgtable_64.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mm_types.h>
#include <linux/mmdebug.h>
#include <linux/log2.h>
@@ -1233,12 +1233,12 @@ static inline int pgd_none(pgd_t pgd)
}
#endif /* CONFIG_PGTABLE_LEVELS > 4 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
#define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int direct_gbpages;
void init_mem_mapping(void);
@@ -1812,6 +1812,6 @@ bool arch_is_platform_page(u64 paddr);
WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \
set_pgd(pgdp, pgd); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_H */
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
index 7d4ad8907297c..b612cc57a4d34 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -13,7 +13,7 @@
* This file contains the functions and defines necessary to modify and use
* the i386 page table tree.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <linux/threads.h>
#include <asm/paravirt.h>
@@ -45,7 +45,7 @@ do { \
flush_tlb_one_kernel((vaddr)); \
} while (0)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* This is used to calculate the .brk reservation for initial pagetables.
diff --git a/arch/x86/include/asm/pgtable_32_areas.h b/arch/x86/include/asm/pgtable_32_areas.h
index b6355416a15a8..921148b429676 100644
--- a/arch/x86/include/asm/pgtable_32_areas.h
+++ b/arch/x86/include/asm/pgtable_32_areas.h
@@ -13,7 +13,7 @@
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern bool __vmalloc_start_set; /* set once high_memory is set */
#endif
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index d1426b64c1b97..b89f8f1194a9f 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -5,7 +5,7 @@
#include <linux/const.h>
#include <asm/pgtable_64_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This file contains the functions and defines necessary to modify and use
@@ -270,7 +270,7 @@ static inline bool gup_fast_permitted(unsigned long start, unsigned long end)
#include <asm/pgtable-invert.h>
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define l4_index(x) (((x) >> 39) & 511)
#define pud_index(x) (((x) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
@@ -291,5 +291,5 @@ L3_START_KERNEL = pud_index(__START_KERNEL_map)
i = i + 1 ; \
.endr
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_64_H */
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index ec68f8369bdca..5bb782d856f2c 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -4,7 +4,7 @@
#include <asm/sparsemem.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/kaslr.h>
@@ -44,7 +44,7 @@ static inline bool pgtable_l5_enabled(void)
extern unsigned int pgdir_shift;
extern unsigned int ptrs_per_p4d;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD 0
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 4b804531b03c3..ded7075c60634 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -164,7 +164,7 @@
* to have the WB mode at index 0 (all bits clear). This is the default
* right now and likely would break too much if changed.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum page_cache_mode {
_PAGE_CACHE_MODE_WB = 0,
_PAGE_CACHE_MODE_WC = 1,
@@ -239,7 +239,7 @@ enum page_cache_mode {
#define __PAGE_KERNEL_IO_NOCACHE __PAGE_KERNEL_NOCACHE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __PAGE_KERNEL_ENC (__PAGE_KERNEL | _ENC)
#define __PAGE_KERNEL_ENC_WP (__PAGE_KERNEL_WP | _ENC)
@@ -262,7 +262,7 @@ enum page_cache_mode {
#define PAGE_KERNEL_IO __pgprot_mask(__PAGE_KERNEL_IO)
#define PAGE_KERNEL_IO_NOCACHE __pgprot_mask(__PAGE_KERNEL_IO_NOCACHE)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* early identity mapping pte attrib macros.
@@ -281,7 +281,7 @@ enum page_cache_mode {
# include <asm/pgtable_64_types.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -580,6 +580,6 @@ extern int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn,
unsigned long page_flags);
extern int __init kernel_unmap_pages_in_pgd(pgd_t *pgd, unsigned long address,
unsigned long numpages);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_DEFS_H */
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 365798cb4408d..5d0dbab852640 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -8,7 +8,7 @@
#ifndef _ASM_X86_PROM_H
#define _ASM_X86_PROM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/of.h>
#include <linux/types.h>
@@ -33,5 +33,5 @@ static inline void x86_flattree_get_config(void) { }
extern char cmd_line[COMMAND_LINE_SIZE];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/pti.h b/arch/x86/include/asm/pti.h
index ab167c96b9ab4..88d0a1ab1f77e 100644
--- a/arch/x86/include/asm/pti.h
+++ b/arch/x86/include/asm/pti.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PTI_H
#define _ASM_X86_PTI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
extern void pti_init(void);
@@ -11,5 +11,5 @@ extern void pti_finalize(void);
static inline void pti_check_boottime_disable(void) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PTI_H */
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 5a83fbd9bc0b4..50f75467f73d0 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -6,7 +6,7 @@
#include <asm/page_types.h>
#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __i386__
struct pt_regs {
@@ -469,5 +469,5 @@ extern int do_set_thread_area(struct task_struct *p, int idx,
# define do_set_thread_area_64(p, s, t) (0)
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PTRACE_H */
diff --git a/arch/x86/include/asm/purgatory.h b/arch/x86/include/asm/purgatory.h
index 5528e93250494..2fee5e9f1ccc3 100644
--- a/arch/x86/include/asm/purgatory.h
+++ b/arch/x86/include/asm/purgatory.h
@@ -2,10 +2,10 @@
#ifndef _ASM_X86_PURGATORY_H
#define _ASM_X86_PURGATORY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/purgatory.h>
extern void purgatory(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PURGATORY_H */
diff --git a/arch/x86/include/asm/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h
index 1436226efe3ef..b9fece5fc96d6 100644
--- a/arch/x86/include/asm/pvclock-abi.h
+++ b/arch/x86/include/asm/pvclock-abi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These structs MUST NOT be changed.
@@ -44,5 +44,5 @@ struct pvclock_wall_clock {
#define PVCLOCK_GUEST_STOPPED (1 << 1)
/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */
#define PVCLOCK_COUNTS_FROM_ZERO (1 << 2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H */
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index 87e5482acd0dc..f607081a022ab 100644
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -9,7 +9,7 @@
#define TH_FLAGS_SME_ACTIVE_BIT 0
#define TH_FLAGS_SME_ACTIVE BIT(TH_FLAGS_SME_ACTIVE_BIT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/io.h>
@@ -95,6 +95,6 @@ void reserve_real_mode(void);
void load_trampoline_pgtable(void);
void init_real_mode(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ARCH_X86_REALMODE_H */
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index 9d6411c659205..77d8f49b92bdd 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -233,7 +233,7 @@
#define VDSO_CPUNODE_BITS 12
#define VDSO_CPUNODE_MASK 0xfff
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Helper functions to store/load CPU and node numbers */
@@ -265,7 +265,7 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
*node = (p >> VDSO_CPUNODE_BITS);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef __KERNEL__
@@ -286,7 +286,7 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
*/
#define XEN_EARLY_IDT_HANDLER_SIZE (8 + ENDBR_INSN_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const char early_idt_handler_array[NUM_EXCEPTION_VECTORS][EARLY_IDT_HANDLER_SIZE];
extern void early_ignore_irq(void);
@@ -350,7 +350,7 @@ static inline void __loadsegment_fs(unsigned short value)
#define savesegment(seg, value) \
asm("mov %%" #seg ",%0":"=r" (value) : : "memory")
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_X86_SEGMENT_H */
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 85f4fde3515c4..09201d47c967b 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -27,7 +27,7 @@
#define OLD_CL_ADDRESS 0x020 /* Relative to real mode data */
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/bootparam.h>
@@ -141,7 +141,7 @@ extern bool builtin_cmdline_added __ro_after_init;
#define builtin_cmdline_added 0
#endif
-#else /* __ASSEMBLY */
+#else /* __ASSEMBLER__ */
.macro __RESERVE_BRK name, size
.pushsection .bss..brk, "aw"
@@ -153,6 +153,6 @@ SYM_DATA_END(__brk_\name)
#define RESERVE_BRK(name, size) __RESERVE_BRK name, size
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SETUP_H */
diff --git a/arch/x86/include/asm/setup_data.h b/arch/x86/include/asm/setup_data.h
index 77c51111a8939..7bb16f843c93d 100644
--- a/arch/x86/include/asm/setup_data.h
+++ b/arch/x86/include/asm/setup_data.h
@@ -4,7 +4,7 @@
#include <uapi/asm/setup_data.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pci_setup_rom {
struct setup_data data;
@@ -27,6 +27,6 @@ struct efi_setup_data {
u64 reserved[8];
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SETUP_DATA_H */
diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h
index fcbbef484a78e..a28ff6b141458 100644
--- a/arch/x86/include/asm/shared/tdx.h
+++ b/arch/x86/include/asm/shared/tdx.h
@@ -106,7 +106,7 @@
#define TDX_PS_1G 2
#define TDX_PS_NR (TDX_PS_1G + 1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler_attributes.h>
@@ -177,5 +177,5 @@ static __always_inline u64 hcall_func(u64 exit_reason)
return exit_reason;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_SHARED_TDX_H */
diff --git a/arch/x86/include/asm/shstk.h b/arch/x86/include/asm/shstk.h
index 4cb77e004615d..ba6f2fe438488 100644
--- a/arch/x86/include/asm/shstk.h
+++ b/arch/x86/include/asm/shstk.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_SHSTK_H
#define _ASM_X86_SHSTK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
struct task_struct;
@@ -37,6 +37,6 @@ static inline int shstk_update_last_frame(unsigned long val) { return 0; }
static inline bool shstk_is_enabled(void) { return false; }
#endif /* CONFIG_X86_USER_SHADOW_STACK */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SHSTK_H */
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 4a4043ca64934..c72d461753742 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_SIGNAL_H
#define _ASM_X86_SIGNAL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
/* Most things should be clean enough to redefine this at will, if care
@@ -28,9 +28,9 @@ typedef struct {
#define SA_IA32_ABI 0x02000000u
#define SA_X32_ABI 0x01000000u
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <uapi/asm/signal.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __ARCH_HAS_SA_RESTORER
@@ -101,5 +101,5 @@ struct pt_regs;
#endif /* !__i386__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SIGNAL_H */
diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
index 2de1e5a75c573..daea94c2993c5 100644
--- a/arch/x86/include/asm/smap.h
+++ b/arch/x86/include/asm/smap.h
@@ -13,7 +13,7 @@
#include <asm/cpufeatures.h>
#include <asm/alternative.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ASM_CLAC \
ALTERNATIVE "", "clac", X86_FEATURE_SMAP
@@ -21,7 +21,7 @@
#define ASM_STAC \
ALTERNATIVE "", "stac", X86_FEATURE_SMAP
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
static __always_inline void clac(void)
{
@@ -61,6 +61,6 @@ static __always_inline void smap_restore(unsigned long flags)
#define ASM_STAC \
ALTERNATIVE("", "stac", X86_FEATURE_SMAP)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SMAP_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index ca073f40698fa..d234a6321c189 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_SMP_H
#define _ASM_X86_SMP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
#include <asm/cpumask.h>
@@ -175,7 +175,7 @@ extern void nmi_selftest(void);
extern unsigned int smpboot_control;
extern unsigned long apic_mmio_base;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Control bits for startup_64 */
#define STARTUP_READ_APICID 0x80000000
diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
index b4b16dafd55ed..65394aa9b49f8 100644
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h
@@ -30,7 +30,7 @@
#define TDX_SUCCESS 0ULL
#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/asm/mce.h>
@@ -126,5 +126,5 @@ static inline int tdx_enable(void) { return -ENODEV; }
static inline const char *tdx_dump_mce_info(struct mce *m) { return NULL; }
#endif /* CONFIG_INTEL_TDX_HOST */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_TDX_H */
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index a55c214f3ba64..9282465eea21d 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -54,7 +54,7 @@
* - this struct should fit entirely inside of one cache line
* - this struct shares the supervisor stack pages
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
#include <asm/cpufeature.h>
#include <linux/atomic.h>
@@ -73,7 +73,7 @@ struct thread_info {
.flags = 0, \
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <asm/asm-offsets.h>
@@ -161,7 +161,7 @@ struct thread_info {
*
* preempt_count needs to be 1 initially, until the scheduler is functional.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Walks up the stack frames to make sure that the specified object is
@@ -213,7 +213,7 @@ static inline int arch_within_stack_frames(const void * const stack,
#endif
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Thread-synchronous status.
@@ -224,7 +224,7 @@ static inline int arch_within_stack_frames(const void * const stack,
*/
#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_COMPAT
#define TS_I386_REGS_POKED 0x0004 /* regs poked by 32-bit ptracer */
@@ -242,6 +242,6 @@ static inline int arch_within_stack_frames(const void * const stack,
extern void arch_setup_new_exec(void);
#define arch_setup_new_exec arch_setup_new_exec
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_THREAD_INFO_H */
diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h
index 85cc57cb65392..8f4579c5a6f8b 100644
--- a/arch/x86/include/asm/unwind_hints.h
+++ b/arch/x86/include/asm/unwind_hints.h
@@ -5,7 +5,7 @@
#include "orc_types.h"
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro UNWIND_HINT_END_OF_STACK
UNWIND_HINT type=UNWIND_HINT_TYPE_END_OF_STACK
@@ -88,6 +88,6 @@
#define UNWIND_HINT_RESTORE \
UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_UNWIND_HINTS_H */
diff --git a/arch/x86/include/asm/vdso/getrandom.h b/arch/x86/include/asm/vdso/getrandom.h
index 2bf9c0e970c3e..785f8edcb9c99 100644
--- a/arch/x86/include/asm/vdso/getrandom.h
+++ b/arch/x86/include/asm/vdso/getrandom.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_GETRANDOM_H
#define __ASM_VDSO_GETRANDOM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/unistd.h>
@@ -37,6 +37,6 @@ static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void
return &vdso_rng_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETRANDOM_H */
diff --git a/arch/x86/include/asm/vdso/gettimeofday.h b/arch/x86/include/asm/vdso/gettimeofday.h
index 375a34b0f3657..428f3f4c2235f 100644
--- a/arch/x86/include/asm/vdso/gettimeofday.h
+++ b/arch/x86/include/asm/vdso/gettimeofday.h
@@ -10,7 +10,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/linux/time.h>
#include <asm/vgtod.h>
@@ -350,6 +350,6 @@ static __always_inline u64 vdso_calc_ns(const struct vdso_data *vd, u64 cycles,
}
#define vdso_calc_ns vdso_calc_ns
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/x86/include/asm/vdso/processor.h b/arch/x86/include/asm/vdso/processor.h
index 2cbce97d29eaf..c9b2ba7a9ec4c 100644
--- a/arch/x86/include/asm/vdso/processor.h
+++ b/arch/x86/include/asm/vdso/processor.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
static __always_inline void rep_nop(void)
@@ -22,6 +22,6 @@ struct getcpu_cache;
notrace long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h
index 37b4a70559a82..72aedebb7648a 100644
--- a/arch/x86/include/asm/vdso/vsyscall.h
+++ b/arch/x86/include/asm/vdso/vsyscall.h
@@ -9,7 +9,7 @@
#define VDSO_PAGE_PVCLOCK_OFFSET 0
#define VDSO_PAGE_HVCLOCK_OFFSET 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
#include <asm/vgtod.h>
@@ -36,6 +36,6 @@ struct vdso_rng_data *__x86_get_k_vdso_rng_data(void)
/* 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 */
diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h
index baca0b00ef768..a078a2b0f032b 100644
--- a/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@ -72,7 +72,7 @@
#endif
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Explicitly size integers that represent pfns in the public interface
* with Xen so that on ARM we can have one ABI that works for 32 and 64
* bit guests. */
@@ -137,7 +137,7 @@ DEFINE_GUEST_HANDLE(xen_ulong_t);
#define TI_SET_DPL(_ti, _dpl) ((_ti)->flags |= (_dpl))
#define TI_SET_IF(_ti, _if) ((_ti)->flags |= ((!!(_if))<<2))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct trap_info {
uint8_t vector; /* exception vector */
uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */
@@ -186,7 +186,7 @@ struct arch_shared_info {
uint32_t wc_sec_hi;
#endif
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_X86_32
#include <asm/xen/interface_32.h>
@@ -196,7 +196,7 @@ struct arch_shared_info {
#include <asm/pvclock-abi.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The following is all CPU context. Note that the fpu_ctxt block is filled
* in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used.
@@ -376,7 +376,7 @@ struct xen_pmu_arch {
} c;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Prefix forces emulation of some non-trapping instructions.
diff --git a/arch/x86/include/asm/xen/interface_32.h b/arch/x86/include/asm/xen/interface_32.h
index dc40578abded7..74d9768a9cf77 100644
--- a/arch/x86/include/asm/xen/interface_32.h
+++ b/arch/x86/include/asm/xen/interface_32.h
@@ -44,7 +44,7 @@
*/
#define __HYPERVISOR_VIRT_START 0xF5800000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct cpu_user_regs {
uint32_t ebx;
@@ -85,7 +85,7 @@ typedef struct xen_callback xen_callback_t;
#define XEN_CALLBACK(__cs, __eip) \
((struct xen_callback){ .cs = (__cs), .eip = (unsigned long)(__eip) })
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
diff --git a/arch/x86/include/asm/xen/interface_64.h b/arch/x86/include/asm/xen/interface_64.h
index c10f279aae936..38a19edb81a31 100644
--- a/arch/x86/include/asm/xen/interface_64.h
+++ b/arch/x86/include/asm/xen/interface_64.h
@@ -77,7 +77,7 @@
#define VGCF_in_syscall (1<<_VGCF_in_syscall)
#define VGCF_IN_SYSCALL VGCF_in_syscall
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct iret_context {
/* Top of stack (%rsp at point of hypercall). */
@@ -143,7 +143,7 @@ typedef unsigned long xen_callback_t;
#define XEN_CALLBACK(__cs, __rip) \
((unsigned long)(__rip))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_XEN_INTERFACE_64_H */
diff --git a/arch/x86/math-emu/control_w.h b/arch/x86/math-emu/control_w.h
index 60f4dcc5edc3c..93cbc89b34e25 100644
--- a/arch/x86/math-emu/control_w.h
+++ b/arch/x86/math-emu/control_w.h
@@ -11,7 +11,7 @@
#ifndef _CONTROLW_H_
#define _CONTROLW_H_
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _Const_(x) $##x
#else
#define _Const_(x) x
diff --git a/arch/x86/math-emu/exception.h b/arch/x86/math-emu/exception.h
index 75230b9775777..59961d350bc4d 100644
--- a/arch/x86/math-emu/exception.h
+++ b/arch/x86/math-emu/exception.h
@@ -10,7 +10,7 @@
#ifndef _EXCEPTION_H_
#define _EXCEPTION_H_
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define Const_(x) $##x
#else
#define Const_(x) x
@@ -37,7 +37,7 @@
#define PRECISION_LOST_UP Const_((EX_Precision | SW_C1))
#define PRECISION_LOST_DOWN Const_(EX_Precision)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef DEBUG
#define EXCEPTION(x) { printk("exception in %s at line %d\n", \
@@ -46,6 +46,6 @@
#define EXCEPTION(x) FPU_exception(x)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _EXCEPTION_H_ */
diff --git a/arch/x86/math-emu/fpu_emu.h b/arch/x86/math-emu/fpu_emu.h
index 0c122226ca56f..def569c50b760 100644
--- a/arch/x86/math-emu/fpu_emu.h
+++ b/arch/x86/math-emu/fpu_emu.h
@@ -20,7 +20,7 @@
*/
#define PECULIAR_486
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include "fpu_asm.h"
#define Const(x) $##x
#else
@@ -68,7 +68,7 @@
#define FPU_Exception Const(0x80000000) /* Added to tag returns. */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include "fpu_system.h"
@@ -213,6 +213,6 @@ asmlinkage int FPU_round(FPU_REG *arg, unsigned int extent, int dummy,
#include "fpu_proto.h"
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _FPU_EMU_H_ */
diff --git a/arch/x86/math-emu/status_w.h b/arch/x86/math-emu/status_w.h
index b77bafec95260..f642957330efc 100644
--- a/arch/x86/math-emu/status_w.h
+++ b/arch/x86/math-emu/status_w.h
@@ -13,7 +13,7 @@
#include "fpu_emu.h" /* for definition of PECULIAR_486 */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define Const__(x) $##x
#else
#define Const__(x) x
@@ -37,7 +37,7 @@
#define SW_Exc_Mask Const__(0x27f) /* Status word exception bit mask */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define COMP_A_gt_B 1
#define COMP_A_eq_B 2
@@ -63,6 +63,6 @@ static inline void setcc(int cc)
# define clear_C1()
#endif /* PECULIAR_486 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _STATUS_H_ */
diff --git a/arch/x86/realmode/rm/realmode.h b/arch/x86/realmode/rm/realmode.h
index c76041a353970..867e55f1d6af4 100644
--- a/arch/x86/realmode/rm/realmode.h
+++ b/arch/x86/realmode/rm/realmode.h
@@ -2,7 +2,7 @@
#ifndef ARCH_X86_REALMODE_RM_REALMODE_H
#define ARCH_X86_REALMODE_RM_REALMODE_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* 16-bit ljmpw to the real_mode_seg
@@ -12,7 +12,7 @@
*/
#define LJMPW_RM(to) .byte 0xea ; .word (to), real_mode_seg
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Signature at the end of the realmode region
diff --git a/arch/x86/realmode/rm/wakeup.h b/arch/x86/realmode/rm/wakeup.h
index 0e4fd08ae4471..3b6d8fa82d3e1 100644
--- a/arch/x86/realmode/rm/wakeup.h
+++ b/arch/x86/realmode/rm/wakeup.h
@@ -7,7 +7,7 @@
#ifndef ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
#define ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
/* This must match data at wakeup.S */
diff --git a/tools/arch/x86/include/asm/asm.h b/tools/arch/x86/include/asm/asm.h
index 3ad3da9a7d974..dbe39b44256ba 100644
--- a/tools/arch/x86/include/asm/asm.h
+++ b/tools/arch/x86/include/asm/asm.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __ASM_FORM(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__,
@@ -123,7 +123,7 @@
#ifdef __KERNEL__
/* Exception table entry */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
.pushsection "__ex_table","a" ; \
.balign 4 ; \
@@ -154,7 +154,7 @@
# define _ASM_NOKPROBE(entry)
# endif
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
# define _EXPAND_EXTABLE_HANDLE(x) #x
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
" .pushsection \"__ex_table\",\"a\"\n" \
@@ -186,7 +186,7 @@
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
diff --git a/tools/arch/x86/include/asm/nops.h b/tools/arch/x86/include/asm/nops.h
index 1c1b7550fa550..cd94221d83358 100644
--- a/tools/arch/x86/include/asm/nops.h
+++ b/tools/arch/x86/include/asm/nops.h
@@ -82,7 +82,7 @@
#define ASM_NOP7 _ASM_BYTES(BYTES_NOP7)
#define ASM_NOP8 _ASM_BYTES(BYTES_NOP8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const unsigned char * const x86_nops[];
#endif
diff --git a/tools/arch/x86/include/asm/orc_types.h b/tools/arch/x86/include/asm/orc_types.h
index 46d7e06763c9f..e0125afa53fb9 100644
--- a/tools/arch/x86/include/asm/orc_types.h
+++ b/tools/arch/x86/include/asm/orc_types.h
@@ -45,7 +45,7 @@
#define ORC_TYPE_REGS 3
#define ORC_TYPE_REGS_PARTIAL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/byteorder.h>
/*
@@ -73,6 +73,6 @@ struct orc_entry {
#endif
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ORC_TYPES_H */
diff --git a/tools/arch/x86/include/asm/pvclock-abi.h b/tools/arch/x86/include/asm/pvclock-abi.h
index 1436226efe3ef..b9fece5fc96d6 100644
--- a/tools/arch/x86/include/asm/pvclock-abi.h
+++ b/tools/arch/x86/include/asm/pvclock-abi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These structs MUST NOT be changed.
@@ -44,5 +44,5 @@ struct pvclock_wall_clock {
#define PVCLOCK_GUEST_STOPPED (1 << 1)
/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */
#define PVCLOCK_COUNTS_FROM_ZERO (1 << 2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [tip: x86/merge] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers
2025-03-14 7:10 ` [PATCH 37/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 9:04 ` tip-bot2 for Thomas Huth
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: tip-bot2 for Thomas Huth @ 2025-03-14 9:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: Thomas Huth, Ingo Molnar, Brian Gerst, Juergen Gross,
H. Peter Anvin, Kees Cook, Linus Torvalds, x86, linux-kernel
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: 7f0dc4a0337387d7612f2863f931f0e753fd4397
Gitweb: https://git.kernel.org/tip/7f0dc4a0337387d7612f2863f931f0e753fd4397
Author: Thomas Huth <thuth@redhat.com>
AuthorDate: Fri, 14 Mar 2025 08:10:08 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 14 Mar 2025 09:47:31 +01:00
x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers
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 mostly a mechanical patch (done with a simple "sed -i"
statement), with some manual tweaks in <asm/frame.h>, <asm/hw_irq.h>
and <asm/setup.h> that mentioned this macro in comments with some
missing underscores.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250314071013.1575167-38-thuth@redhat.com
---
arch/x86/boot/boot.h | 4 ++--
arch/x86/entry/vdso/extable.h | 2 +-
arch/x86/include/asm/alternative.h | 6 +++---
arch/x86/include/asm/asm.h | 10 +++++-----
arch/x86/include/asm/boot.h | 2 +-
arch/x86/include/asm/cpufeature.h | 4 ++--
arch/x86/include/asm/cpumask.h | 4 ++--
arch/x86/include/asm/current.h | 4 ++--
arch/x86/include/asm/desc_defs.h | 4 ++--
arch/x86/include/asm/dwarf2.h | 2 +-
arch/x86/include/asm/fixmap.h | 4 ++--
arch/x86/include/asm/frame.h | 10 +++++-----
arch/x86/include/asm/fred.h | 4 ++--
arch/x86/include/asm/fsgsbase.h | 4 ++--
arch/x86/include/asm/ftrace.h | 8 ++++----
arch/x86/include/asm/hw_irq.h | 4 ++--
arch/x86/include/asm/ibt.h | 12 ++++++------
arch/x86/include/asm/idtentry.h | 6 +++---
arch/x86/include/asm/inst.h | 2 +-
arch/x86/include/asm/irqflags.h | 10 +++++-----
arch/x86/include/asm/jump_label.h | 4 ++--
arch/x86/include/asm/kasan.h | 2 +-
arch/x86/include/asm/kexec.h | 4 ++--
arch/x86/include/asm/linkage.h | 6 +++---
arch/x86/include/asm/mem_encrypt.h | 4 ++--
arch/x86/include/asm/msr.h | 4 ++--
arch/x86/include/asm/nops.h | 2 +-
arch/x86/include/asm/nospec-branch.h | 6 +++---
arch/x86/include/asm/orc_types.h | 4 ++--
arch/x86/include/asm/page.h | 4 ++--
arch/x86/include/asm/page_32.h | 4 ++--
arch/x86/include/asm/page_32_types.h | 4 ++--
arch/x86/include/asm/page_64.h | 4 ++--
arch/x86/include/asm/page_64_types.h | 2 +-
arch/x86/include/asm/page_types.h | 4 ++--
arch/x86/include/asm/paravirt.h | 14 +++++++-------
arch/x86/include/asm/paravirt_types.h | 4 ++--
arch/x86/include/asm/percpu.h | 6 +++---
arch/x86/include/asm/pgtable-2level_types.h | 4 ++--
arch/x86/include/asm/pgtable-3level_types.h | 4 ++--
arch/x86/include/asm/pgtable-invert.h | 4 ++--
arch/x86/include/asm/pgtable.h | 12 ++++++------
arch/x86/include/asm/pgtable_32.h | 4 ++--
arch/x86/include/asm/pgtable_32_areas.h | 2 +-
arch/x86/include/asm/pgtable_64.h | 6 +++---
arch/x86/include/asm/pgtable_64_types.h | 4 ++--
arch/x86/include/asm/pgtable_types.h | 10 +++++-----
arch/x86/include/asm/prom.h | 4 ++--
arch/x86/include/asm/pti.h | 4 ++--
arch/x86/include/asm/ptrace.h | 4 ++--
arch/x86/include/asm/purgatory.h | 4 ++--
arch/x86/include/asm/pvclock-abi.h | 4 ++--
arch/x86/include/asm/realmode.h | 4 ++--
arch/x86/include/asm/segment.h | 8 ++++----
arch/x86/include/asm/setup.h | 6 +++---
arch/x86/include/asm/setup_data.h | 4 ++--
arch/x86/include/asm/shared/tdx.h | 4 ++--
arch/x86/include/asm/shstk.h | 4 ++--
arch/x86/include/asm/signal.h | 8 ++++----
arch/x86/include/asm/smap.h | 6 +++---
arch/x86/include/asm/smp.h | 4 ++--
arch/x86/include/asm/tdx.h | 4 ++--
arch/x86/include/asm/thread_info.h | 12 ++++++------
arch/x86/include/asm/unwind_hints.h | 4 ++--
arch/x86/include/asm/vdso/getrandom.h | 4 ++--
arch/x86/include/asm/vdso/gettimeofday.h | 4 ++--
arch/x86/include/asm/vdso/processor.h | 4 ++--
arch/x86/include/asm/vdso/vsyscall.h | 4 ++--
arch/x86/include/asm/xen/interface.h | 10 +++++-----
arch/x86/include/asm/xen/interface_32.h | 4 ++--
arch/x86/include/asm/xen/interface_64.h | 4 ++--
arch/x86/math-emu/control_w.h | 2 +-
arch/x86/math-emu/exception.h | 6 +++---
arch/x86/math-emu/fpu_emu.h | 6 +++---
arch/x86/math-emu/status_w.h | 6 +++---
arch/x86/realmode/rm/realmode.h | 4 ++--
arch/x86/realmode/rm/wakeup.h | 2 +-
tools/arch/x86/include/asm/asm.h | 8 ++++----
tools/arch/x86/include/asm/nops.h | 2 +-
tools/arch/x86/include/asm/orc_types.h | 4 ++--
tools/arch/x86/include/asm/pvclock-abi.h | 4 ++--
81 files changed, 202 insertions(+), 202 deletions(-)
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 0f24f7e..38f17a1 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -16,7 +16,7 @@
#define STACK_SIZE 1024 /* Minimum number of bytes for stack */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stdarg.h>
#include <linux/types.h>
@@ -327,6 +327,6 @@ void probe_cards(int unsafe);
/* video-vesa.c */
void vesa_store_edid(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* BOOT_BOOT_H */
diff --git a/arch/x86/entry/vdso/extable.h b/arch/x86/entry/vdso/extable.h
index b56f6b0..baba612 100644
--- a/arch/x86/entry/vdso/extable.h
+++ b/arch/x86/entry/vdso/extable.h
@@ -7,7 +7,7 @@
* vDSO uses a dedicated handler the addresses are relative to the overall
* exception table, not each individual entry.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ASM_VDSO_EXTABLE_HANDLE(from, to) \
ASM_VDSO_EXTABLE_HANDLE from to
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index e3903b7..8e4fb48 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -15,7 +15,7 @@
#define ALT_DIRECT_CALL(feature) ((ALT_FLAG_DIRECT_CALL << ALT_FLAGS_SHIFT) | (feature))
#define ALT_CALL_ALWAYS ALT_DIRECT_CALL(X86_FEATURE_ALWAYS)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stddef.h>
@@ -286,7 +286,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
void BUG_func(void);
void nop_func(void);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_SMP
.macro LOCK_PREFIX
@@ -369,6 +369,6 @@ void nop_func(void);
ALTERNATIVE_2 oldinstr, newinstr_no, X86_FEATURE_ALWAYS, \
newinstr_yes, ft_flags
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_ALTERNATIVE_H */
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 2bec0c8..e9653ee 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __ASM_FORM(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__,
@@ -113,7 +113,7 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef __pic__
static __always_inline __pure void *rip_rel_ptr(void *p)
{
@@ -144,7 +144,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
# include <asm/extable_fixup_types.h>
/* Exception table entry */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define _ASM_EXTABLE_TYPE(from, to, type) \
.pushsection "__ex_table","a" ; \
@@ -164,7 +164,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
# define _ASM_NOKPROBE(entry)
# endif
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
# define DEFINE_EXTABLE_TYPE_REG \
".macro extable_type_reg type:req reg:req\n" \
@@ -221,7 +221,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define _ASM_EXTABLE(from, to) \
_ASM_EXTABLE_TYPE(from, to, EX_TYPE_DEFAULT)
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 3e5b111..3f02ff6 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -74,7 +74,7 @@
# define BOOT_STACK_SIZE 0x1000
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int output_len;
extern const unsigned long kernel_text_size;
extern const unsigned long kernel_total_size;
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index de1ad09..7e67bac 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -4,7 +4,7 @@
#include <asm/processor.h>
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
#include <asm/asm.h>
#include <linux/bitops.h>
@@ -208,5 +208,5 @@ t_no:
#define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \
boot_cpu_data.x86_model
-#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
+#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */
#endif /* _ASM_X86_CPUFEATURE_H */
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 4acfd57..70f6b60 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_CPUMASK_H
#define _ASM_X86_CPUMASK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
extern void setup_cpu_local_masks(void);
@@ -34,5 +34,5 @@ static __always_inline void arch_cpumask_clear_cpu(int cpu, struct cpumask *dstp
#define arch_cpu_is_offline(cpu) unlikely(!arch_cpu_online(cpu))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_CPUMASK_H */
diff --git a/arch/x86/include/asm/current.h b/arch/x86/include/asm/current.h
index bf59538..f2d0b38 100644
--- a/arch/x86/include/asm/current.h
+++ b/arch/x86/include/asm/current.h
@@ -5,7 +5,7 @@
#include <linux/build_bug.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/percpu.h>
@@ -51,6 +51,6 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_CURRENT_H */
diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
index d440a65..7e6b931 100644
--- a/arch/x86/include/asm/desc_defs.h
+++ b/arch/x86/include/asm/desc_defs.h
@@ -58,7 +58,7 @@
#define DESC_USER (_DESC_DPL(3))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -166,7 +166,7 @@ struct desc_ptr {
unsigned long address;
} __attribute__((packed)) ;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Boot IDT definitions */
#define BOOT_IDT_ENTRIES 32
diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index 430fca1..302e11b 100644
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_DWARF2_H
#define _ASM_X86_DWARF2_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#warning "asm/dwarf2.h should be only included in pure assembly files"
#endif
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index d0dcefb..4519c9f 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -31,7 +31,7 @@
/* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */
#define FIXMAP_PMD_TOP 507
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kernel.h>
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -196,5 +196,5 @@ void __init *early_memremap_decrypted_wp(resource_size_t phys_addr,
void __early_set_fixmap(enum fixed_addresses idx,
phys_addr_t phys, pgprot_t flags);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_FIXMAP_H */
diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h
index fb42659..0ab6507 100644
--- a/arch/x86/include/asm/frame.h
+++ b/arch/x86/include/asm/frame.h
@@ -11,7 +11,7 @@
#ifdef CONFIG_FRAME_POINTER
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro FRAME_BEGIN
push %_ASM_BP
@@ -51,7 +51,7 @@
.endm
#endif /* CONFIG_X86_64 */
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define FRAME_BEGIN \
"push %" _ASM_BP "\n" \
@@ -82,18 +82,18 @@ static inline unsigned long encode_frame_pointer(struct pt_regs *regs)
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define FRAME_OFFSET __ASM_SEL(4, 8)
#else /* !CONFIG_FRAME_POINTER */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ENCODE_FRAME_POINTER ptregs_offset=0
.endm
-#else /* !__ASSEMBLY */
+#else /* !__ASSEMBLER__ */
#define ENCODE_FRAME_POINTER
diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h
index 25ca00b..2a29e52 100644
--- a/arch/x86/include/asm/fred.h
+++ b/arch/x86/include/asm/fred.h
@@ -32,7 +32,7 @@
#define FRED_CONFIG_INT_STKLVL(l) (_AT(unsigned long, l) << 9)
#define FRED_CONFIG_ENTRYPOINT(p) _AT(unsigned long, (p))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_FRED
#include <linux/kernel.h>
@@ -113,6 +113,6 @@ static inline void fred_entry_from_kvm(unsigned int type, unsigned int vector) {
static inline void fred_sync_rsp0(unsigned long rsp0) { }
static inline void fred_update_rsp0(void) { }
#endif /* CONFIG_X86_FRED */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* ASM_X86_FRED_H */
diff --git a/arch/x86/include/asm/fsgsbase.h b/arch/x86/include/asm/fsgsbase.h
index 9e7e8ca..02f2395 100644
--- a/arch/x86/include/asm/fsgsbase.h
+++ b/arch/x86/include/asm/fsgsbase.h
@@ -2,7 +2,7 @@
#ifndef _ASM_FSGSBASE_H
#define _ASM_FSGSBASE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_64
@@ -80,6 +80,6 @@ extern unsigned long x86_fsgsbase_read_task(struct task_struct *task,
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_FSGSBASE_H */
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index f9cb4d0..2d02d5b 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -22,7 +22,7 @@
#define ARCH_SUPPORTS_FTRACE_OPS 1
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __fentry__(void);
static inline unsigned long ftrace_call_adjust(unsigned long addr)
@@ -118,11 +118,11 @@ struct dyn_arch_ftrace {
};
#endif /* CONFIG_DYNAMIC_FTRACE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_FUNCTION_TRACER */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void prepare_ftrace_return(unsigned long ip, unsigned long *parent,
unsigned long frame_pointer);
@@ -166,6 +166,6 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)
}
#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_IA32_EMULATION */
#endif /* !COMPILE_OFFSETS */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_FTRACE_H */
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index edebf10..162ebd7 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -16,7 +16,7 @@
#include <asm/irq_vectors.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/percpu.h>
#include <linux/profile.h>
@@ -128,6 +128,6 @@ extern char spurious_entries_start[];
typedef struct irq_desc* vector_irq_t[NR_VECTORS];
DECLARE_PER_CPU(vector_irq_t, vector_irq);
-#endif /* !ASSEMBLY_ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_HW_IRQ_H */
diff --git a/arch/x86/include/asm/ibt.h b/arch/x86/include/asm/ibt.h
index 1e59581..e7f4caa 100644
--- a/arch/x86/include/asm/ibt.h
+++ b/arch/x86/include/asm/ibt.h
@@ -21,7 +21,7 @@
#define HAS_KERNEL_IBT 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_64
#define ASM_ENDBR "endbr64\n\t"
@@ -77,7 +77,7 @@ static inline bool is_endbr(u32 val)
extern __noendbr u64 ibt_save(bool disable);
extern __noendbr void ibt_restore(u64 save);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_X86_64
#define ENDBR endbr64
@@ -85,13 +85,13 @@ extern __noendbr void ibt_restore(u64 save);
#define ENDBR endbr32
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* !IBT */
#define HAS_KERNEL_IBT 0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define ASM_ENDBR
#define IBT_NOSEAL(name)
@@ -103,11 +103,11 @@ static inline bool is_endbr(u32 val) { return false; }
static inline u64 ibt_save(bool disable) { return 0; }
static inline void ibt_restore(u64 save) { }
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define ENDBR
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_X86_KERNEL_IBT */
diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
index ad5c68f..a4ec27c 100644
--- a/arch/x86/include/asm/idtentry.h
+++ b/arch/x86/include/asm/idtentry.h
@@ -7,7 +7,7 @@
#define IDT_ALIGN (8 * (1 + HAS_KERNEL_IBT))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/entry-common.h>
#include <linux/hardirq.h>
@@ -474,7 +474,7 @@ static inline void fred_install_sysvec(unsigned int vector, const idtentry_t fun
idt_install_sysvec(vector, asm_##function); \
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
/*
* The ASM variants for DECLARE_IDTENTRY*() which emit the ASM entry stubs.
@@ -579,7 +579,7 @@ SYM_CODE_START(spurious_entries_start)
SYM_CODE_END(spurious_entries_start)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* The actual entry points. Note that DECLARE_IDTENTRY*() serves two
diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h
index 438ccd4..e48a00b 100644
--- a/arch/x86/include/asm/inst.h
+++ b/arch/x86/include/asm/inst.h
@@ -6,7 +6,7 @@
#ifndef X86_ASM_INST_H
#define X86_ASM_INST_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define REG_NUM_INVALID 100
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index cf7fc2b..abb8374 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -4,7 +4,7 @@
#include <asm/processor-flags.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/nospec-branch.h>
@@ -79,7 +79,7 @@ static __always_inline void native_local_irq_restore(unsigned long flags)
#ifdef CONFIG_PARAVIRT_XXL
#include <asm/paravirt.h>
#else
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
static __always_inline unsigned long arch_local_save_flags(void)
@@ -133,10 +133,10 @@ static __always_inline unsigned long arch_local_irq_save(void)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_PARAVIRT_XXL */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static __always_inline int arch_irqs_disabled_flags(unsigned long flags)
{
return !(flags & X86_EFLAGS_IF);
@@ -154,6 +154,6 @@ static __always_inline void arch_local_irq_restore(unsigned long flags)
if (!arch_irqs_disabled_flags(flags))
arch_local_irq_enable();
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index 3f1c1d6..61dd1de 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -7,7 +7,7 @@
#include <asm/asm.h>
#include <asm/nops.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
#include <linux/types.h>
@@ -55,6 +55,6 @@ l_yes:
extern int arch_jump_entry_size(struct jump_entry *entry);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h
index de75306..d7e33c7 100644
--- a/arch/x86/include/asm/kasan.h
+++ b/arch/x86/include/asm/kasan.h
@@ -23,7 +23,7 @@
(1ULL << (__VIRTUAL_MASK_SHIFT - \
KASAN_SHADOW_SCALE_SHIFT)))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_KASAN
void __init kasan_early_init(void);
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index 8ad1874..c755092 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -13,7 +13,7 @@
# define KEXEC_CONTROL_PAGE_SIZE 4096
# define KEXEC_CONTROL_CODE_MAX_SIZE 2048
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/string.h>
#include <linux/kernel.h>
@@ -225,6 +225,6 @@ unsigned int arch_crash_get_elfcorehdr_size(void);
#define crash_get_elfcorehdr_size arch_crash_get_elfcorehdr_size
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_KEXEC_H */
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index dc31b13..c95dad6 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -38,7 +38,7 @@
#define ASM_FUNC_ALIGN __stringify(__FUNC_ALIGN)
#define SYM_F_ALIGN __FUNC_ALIGN
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
#define RET jmp __x86_return_thunk
@@ -50,7 +50,7 @@
#endif
#endif /* CONFIG_MITIGATION_RETPOLINE */
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
#define ASM_RET "jmp __x86_return_thunk\n\t"
@@ -62,7 +62,7 @@
#endif
#endif /* CONFIG_MITIGATION_RETPOLINE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Depending on -fpatchable-function-entry=N,N usage (CONFIG_CALL_PADDING) the
diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index f922b68..1530ee3 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -10,7 +10,7 @@
#ifndef __X86_MEM_ENCRYPT_H__
#define __X86_MEM_ENCRYPT_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/cc_platform.h>
@@ -114,6 +114,6 @@ void add_encrypt_protection_map(void);
extern char __start_bss_decrypted[], __end_bss_decrypted[], __start_bss_decrypted_unused[];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __X86_MEM_ENCRYPT_H__ */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 0018535..9397a31 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -4,7 +4,7 @@
#include "msr-index.h"
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/asm.h>
#include <asm/errno.h>
@@ -397,5 +397,5 @@ static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
return wrmsr_safe_regs(regs);
}
#endif /* CONFIG_SMP */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_MSR_H */
diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h
index 1c1b755..cd94221 100644
--- a/arch/x86/include/asm/nops.h
+++ b/arch/x86/include/asm/nops.h
@@ -82,7 +82,7 @@
#define ASM_NOP7 _ASM_BYTES(BYTES_NOP7)
#define ASM_NOP8 _ASM_BYTES(BYTES_NOP8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const unsigned char * const x86_nops[];
#endif
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 7e8bf78..bbd29dc 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -177,7 +177,7 @@
add $(BITS_PER_LONG/8), %_ASM_SP; \
lfence;
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions
@@ -336,7 +336,7 @@
#define CLEAR_BRANCH_HISTORY_VMEXIT
#endif
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];
extern retpoline_thunk_t __x86_indirect_thunk_array[];
@@ -596,6 +596,6 @@ static __always_inline void mds_idle_clear_cpu_buffers(void)
mds_clear_cpu_buffers();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */
diff --git a/arch/x86/include/asm/orc_types.h b/arch/x86/include/asm/orc_types.h
index 46d7e06..e0125af 100644
--- a/arch/x86/include/asm/orc_types.h
+++ b/arch/x86/include/asm/orc_types.h
@@ -45,7 +45,7 @@
#define ORC_TYPE_REGS 3
#define ORC_TYPE_REGS_PARTIAL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/byteorder.h>
/*
@@ -73,6 +73,6 @@ struct orc_entry {
#endif
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ORC_TYPES_H */
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index c9fe207..9265f2f 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -14,7 +14,7 @@
#include <asm/page_32.h>
#endif /* CONFIG_X86_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct page;
@@ -84,7 +84,7 @@ static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits)
return __canonical_address(vaddr, vaddr_bits) == vaddr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <asm-generic/memory_model.h>
#include <asm-generic/getorder.h>
diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
index 580d71a..0c62370 100644
--- a/arch/x86/include/asm/page_32.h
+++ b/arch/x86/include/asm/page_32.h
@@ -4,7 +4,7 @@
#include <asm/page_32_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET)
#ifdef CONFIG_DEBUG_VIRTUAL
@@ -26,6 +26,6 @@ static inline void copy_page(void *to, void *from)
{
memcpy(to, from, PAGE_SIZE);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_32_H */
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index faf9cc1..88e3c8d 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -63,7 +63,7 @@
*/
#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This much address space is reserved for vmalloc() and iomap()
@@ -75,6 +75,6 @@ extern int sysctl_legacy_va_layout;
extern void find_low_pfn_range(void);
extern void setup_bootmem_allocator(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_32_DEFS_H */
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index d635766..442357d 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -4,7 +4,7 @@
#include <asm/page_64_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cpufeatures.h>
#include <asm/alternative.h>
@@ -94,7 +94,7 @@ static __always_inline unsigned long task_size_max(void)
}
#endif /* CONFIG_X86_5LEVEL */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_X86_VSYSCALL_EMULATION
# define __HAVE_ARCH_GATE_AREA 1
diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 06ef254..1faa8f8 100644
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PAGE_64_DEFS_H
#define _ASM_X86_PAGE_64_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/kaslr.h>
#endif
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 9746889..9f77bf0 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -43,7 +43,7 @@
#define IOREMAP_MAX_ORDER (PMD_SHIFT)
#endif /* CONFIG_X86_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_DYNAMIC_PHYSICAL_MASK
extern phys_addr_t physical_mask;
@@ -66,6 +66,6 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);
extern void initmem_init(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_DEFS_H */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 041aff5..d784d26 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -6,7 +6,7 @@
#include <asm/paravirt_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
#endif
@@ -15,7 +15,7 @@ struct mm_struct;
#include <asm/asm.h>
#include <asm/nospec-branch.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <linux/types.h>
#include <linux/cpumask.h>
@@ -720,7 +720,7 @@ static __always_inline unsigned long arch_local_irq_save(void)
extern void default_banner(void);
void native_pv_lock_init(void) __init;
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_X86_64
#ifdef CONFIG_PARAVIRT_XXL
@@ -740,18 +740,18 @@ void native_pv_lock_init(void) __init;
#endif /* CONFIG_PARAVIRT_XXL */
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* CONFIG_PARAVIRT */
# define default_banner x86_init_noop
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void native_pv_lock_init(void)
{
}
#endif
#endif /* !CONFIG_PARAVIRT */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef CONFIG_PARAVIRT_XXL
static inline void paravirt_enter_mmap(struct mm_struct *mm)
{
@@ -769,5 +769,5 @@ static inline void paravirt_set_cap(void)
{
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PARAVIRT_H */
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index fea56b0..4ec9265 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -4,7 +4,7 @@
#ifdef CONFIG_PARAVIRT
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/desc_defs.h>
@@ -519,7 +519,7 @@ unsigned long pv_native_read_cr2(void);
#define paravirt_nop ((void *)nop_func)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index e525cd8..a1a4fb4 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -10,7 +10,7 @@
# define __percpu_rel
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_SMP
# define __percpu %__percpu_seg:
@@ -26,7 +26,7 @@
# define INIT_PER_CPU_VAR(var) var
#endif
-#else /* !__ASSEMBLY__: */
+#else /* !__ASSEMBLER__: */
#include <linux/build_bug.h>
#include <linux/stringify.h>
@@ -619,7 +619,7 @@ do { \
/* We can use this directly for local CPU (faster). */
DECLARE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/pgtable-2level_types.h b/arch/x86/include/asm/pgtable-2level_types.h
index 7f6ccff..d27c48b 100644
--- a/arch/x86/include/asm/pgtable-2level_types.h
+++ b/arch/x86/include/asm/pgtable-2level_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PGTABLE_2LEVEL_DEFS_H
#define _ASM_X86_PGTABLE_2LEVEL_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
typedef unsigned long pteval_t;
@@ -16,7 +16,7 @@ typedef union {
pteval_t pte;
pteval_t pte_low;
} pte_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD 0
diff --git a/arch/x86/include/asm/pgtable-3level_types.h b/arch/x86/include/asm/pgtable-3level_types.h
index 8091134..9d5b257 100644
--- a/arch/x86/include/asm/pgtable-3level_types.h
+++ b/arch/x86/include/asm/pgtable-3level_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H
#define _ASM_X86_PGTABLE_3LEVEL_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
typedef u64 pteval_t;
@@ -25,7 +25,7 @@ typedef union {
};
pmdval_t pmd;
} pmd_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD (!static_cpu_has(X86_FEATURE_PTI))
diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h
index a0c1525..e12e52a 100644
--- a/arch/x86/include/asm/pgtable-invert.h
+++ b/arch/x86/include/asm/pgtable-invert.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PGTABLE_INVERT_H
#define _ASM_PGTABLE_INVERT_H 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* A clear pte value is special, and doesn't get inverted.
@@ -36,6 +36,6 @@ static inline u64 flip_protnone_guard(u64 oldval, u64 val, u64 mask)
return val;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 593f10a..7bd6bd6 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -15,7 +15,7 @@
cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS))) \
: (prot))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/spinlock.h>
#include <asm/x86_init.h>
#include <asm/pkru.h>
@@ -973,7 +973,7 @@ static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
}
#endif /* CONFIG_MITIGATION_PAGE_TABLE_ISOLATION */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_X86_32
@@ -982,7 +982,7 @@ static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
# include <asm/pgtable_64.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mm_types.h>
#include <linux/mmdebug.h>
#include <linux/log2.h>
@@ -1233,12 +1233,12 @@ static inline int pgd_none(pgd_t pgd)
}
#endif /* CONFIG_PGTABLE_LEVELS > 4 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
#define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int direct_gbpages;
void init_mem_mapping(void);
@@ -1812,6 +1812,6 @@ bool arch_is_platform_page(u64 paddr);
WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \
set_pgd(pgdp, pgd); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_H */
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
index 7d4ad89..b612cc5 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -13,7 +13,7 @@
* This file contains the functions and defines necessary to modify and use
* the i386 page table tree.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <linux/threads.h>
#include <asm/paravirt.h>
@@ -45,7 +45,7 @@ do { \
flush_tlb_one_kernel((vaddr)); \
} while (0)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* This is used to calculate the .brk reservation for initial pagetables.
diff --git a/arch/x86/include/asm/pgtable_32_areas.h b/arch/x86/include/asm/pgtable_32_areas.h
index b635541..921148b 100644
--- a/arch/x86/include/asm/pgtable_32_areas.h
+++ b/arch/x86/include/asm/pgtable_32_areas.h
@@ -13,7 +13,7 @@
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern bool __vmalloc_start_set; /* set once high_memory is set */
#endif
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index d1426b6..b89f8f1 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -5,7 +5,7 @@
#include <linux/const.h>
#include <asm/pgtable_64_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This file contains the functions and defines necessary to modify and use
@@ -270,7 +270,7 @@ static inline bool gup_fast_permitted(unsigned long start, unsigned long end)
#include <asm/pgtable-invert.h>
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define l4_index(x) (((x) >> 39) & 511)
#define pud_index(x) (((x) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
@@ -291,5 +291,5 @@ L3_START_KERNEL = pud_index(__START_KERNEL_map)
i = i + 1 ; \
.endr
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_64_H */
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index ec68f83..5bb782d 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -4,7 +4,7 @@
#include <asm/sparsemem.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/kaslr.h>
@@ -44,7 +44,7 @@ static inline bool pgtable_l5_enabled(void)
extern unsigned int pgdir_shift;
extern unsigned int ptrs_per_p4d;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD 0
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 4b80453..ded7075 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -164,7 +164,7 @@
* to have the WB mode at index 0 (all bits clear). This is the default
* right now and likely would break too much if changed.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum page_cache_mode {
_PAGE_CACHE_MODE_WB = 0,
_PAGE_CACHE_MODE_WC = 1,
@@ -239,7 +239,7 @@ enum page_cache_mode {
#define __PAGE_KERNEL_IO_NOCACHE __PAGE_KERNEL_NOCACHE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __PAGE_KERNEL_ENC (__PAGE_KERNEL | _ENC)
#define __PAGE_KERNEL_ENC_WP (__PAGE_KERNEL_WP | _ENC)
@@ -262,7 +262,7 @@ enum page_cache_mode {
#define PAGE_KERNEL_IO __pgprot_mask(__PAGE_KERNEL_IO)
#define PAGE_KERNEL_IO_NOCACHE __pgprot_mask(__PAGE_KERNEL_IO_NOCACHE)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* early identity mapping pte attrib macros.
@@ -281,7 +281,7 @@ enum page_cache_mode {
# include <asm/pgtable_64_types.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -580,6 +580,6 @@ extern int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn,
unsigned long page_flags);
extern int __init kernel_unmap_pages_in_pgd(pgd_t *pgd, unsigned long address,
unsigned long numpages);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_DEFS_H */
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 365798c..5d0dbab 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -8,7 +8,7 @@
#ifndef _ASM_X86_PROM_H
#define _ASM_X86_PROM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/of.h>
#include <linux/types.h>
@@ -33,5 +33,5 @@ static inline void x86_flattree_get_config(void) { }
extern char cmd_line[COMMAND_LINE_SIZE];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/pti.h b/arch/x86/include/asm/pti.h
index ab167c9..88d0a1a 100644
--- a/arch/x86/include/asm/pti.h
+++ b/arch/x86/include/asm/pti.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PTI_H
#define _ASM_X86_PTI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
extern void pti_init(void);
@@ -11,5 +11,5 @@ extern void pti_finalize(void);
static inline void pti_check_boottime_disable(void) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PTI_H */
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 5a83fbd..50f7546 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -6,7 +6,7 @@
#include <asm/page_types.h>
#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __i386__
struct pt_regs {
@@ -469,5 +469,5 @@ extern int do_set_thread_area(struct task_struct *p, int idx,
# define do_set_thread_area_64(p, s, t) (0)
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PTRACE_H */
diff --git a/arch/x86/include/asm/purgatory.h b/arch/x86/include/asm/purgatory.h
index 5528e93..2fee5e9 100644
--- a/arch/x86/include/asm/purgatory.h
+++ b/arch/x86/include/asm/purgatory.h
@@ -2,10 +2,10 @@
#ifndef _ASM_X86_PURGATORY_H
#define _ASM_X86_PURGATORY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/purgatory.h>
extern void purgatory(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PURGATORY_H */
diff --git a/arch/x86/include/asm/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h
index 1436226..b9fece5 100644
--- a/arch/x86/include/asm/pvclock-abi.h
+++ b/arch/x86/include/asm/pvclock-abi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These structs MUST NOT be changed.
@@ -44,5 +44,5 @@ struct pvclock_wall_clock {
#define PVCLOCK_GUEST_STOPPED (1 << 1)
/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */
#define PVCLOCK_COUNTS_FROM_ZERO (1 << 2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H */
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index 87e5482..f607081 100644
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -9,7 +9,7 @@
#define TH_FLAGS_SME_ACTIVE_BIT 0
#define TH_FLAGS_SME_ACTIVE BIT(TH_FLAGS_SME_ACTIVE_BIT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/io.h>
@@ -95,6 +95,6 @@ void reserve_real_mode(void);
void load_trampoline_pgtable(void);
void init_real_mode(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ARCH_X86_REALMODE_H */
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index 9d6411c..77d8f49 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -233,7 +233,7 @@
#define VDSO_CPUNODE_BITS 12
#define VDSO_CPUNODE_MASK 0xfff
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Helper functions to store/load CPU and node numbers */
@@ -265,7 +265,7 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
*node = (p >> VDSO_CPUNODE_BITS);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef __KERNEL__
@@ -286,7 +286,7 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
*/
#define XEN_EARLY_IDT_HANDLER_SIZE (8 + ENDBR_INSN_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const char early_idt_handler_array[NUM_EXCEPTION_VECTORS][EARLY_IDT_HANDLER_SIZE];
extern void early_ignore_irq(void);
@@ -350,7 +350,7 @@ static inline void __loadsegment_fs(unsigned short value)
#define savesegment(seg, value) \
asm("mov %%" #seg ",%0":"=r" (value) : : "memory")
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_X86_SEGMENT_H */
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index 85f4fde..09201d4 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -27,7 +27,7 @@
#define OLD_CL_ADDRESS 0x020 /* Relative to real mode data */
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/bootparam.h>
@@ -141,7 +141,7 @@ extern bool builtin_cmdline_added __ro_after_init;
#define builtin_cmdline_added 0
#endif
-#else /* __ASSEMBLY */
+#else /* __ASSEMBLER__ */
.macro __RESERVE_BRK name, size
.pushsection .bss..brk, "aw"
@@ -153,6 +153,6 @@ SYM_DATA_END(__brk_\name)
#define RESERVE_BRK(name, size) __RESERVE_BRK name, size
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SETUP_H */
diff --git a/arch/x86/include/asm/setup_data.h b/arch/x86/include/asm/setup_data.h
index 77c5111..7bb16f8 100644
--- a/arch/x86/include/asm/setup_data.h
+++ b/arch/x86/include/asm/setup_data.h
@@ -4,7 +4,7 @@
#include <uapi/asm/setup_data.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pci_setup_rom {
struct setup_data data;
@@ -27,6 +27,6 @@ struct efi_setup_data {
u64 reserved[8];
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SETUP_DATA_H */
diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h
index fcbbef4..a28ff6b 100644
--- a/arch/x86/include/asm/shared/tdx.h
+++ b/arch/x86/include/asm/shared/tdx.h
@@ -106,7 +106,7 @@
#define TDX_PS_1G 2
#define TDX_PS_NR (TDX_PS_1G + 1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler_attributes.h>
@@ -177,5 +177,5 @@ static __always_inline u64 hcall_func(u64 exit_reason)
return exit_reason;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_SHARED_TDX_H */
diff --git a/arch/x86/include/asm/shstk.h b/arch/x86/include/asm/shstk.h
index 4cb77e0..ba6f2fe 100644
--- a/arch/x86/include/asm/shstk.h
+++ b/arch/x86/include/asm/shstk.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_SHSTK_H
#define _ASM_X86_SHSTK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
struct task_struct;
@@ -37,6 +37,6 @@ static inline int shstk_update_last_frame(unsigned long val) { return 0; }
static inline bool shstk_is_enabled(void) { return false; }
#endif /* CONFIG_X86_USER_SHADOW_STACK */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SHSTK_H */
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 4a4043c..c72d461 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_SIGNAL_H
#define _ASM_X86_SIGNAL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
/* Most things should be clean enough to redefine this at will, if care
@@ -28,9 +28,9 @@ typedef struct {
#define SA_IA32_ABI 0x02000000u
#define SA_X32_ABI 0x01000000u
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <uapi/asm/signal.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __ARCH_HAS_SA_RESTORER
@@ -101,5 +101,5 @@ struct pt_regs;
#endif /* !__i386__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SIGNAL_H */
diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
index 2de1e5a..daea94c 100644
--- a/arch/x86/include/asm/smap.h
+++ b/arch/x86/include/asm/smap.h
@@ -13,7 +13,7 @@
#include <asm/cpufeatures.h>
#include <asm/alternative.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ASM_CLAC \
ALTERNATIVE "", "clac", X86_FEATURE_SMAP
@@ -21,7 +21,7 @@
#define ASM_STAC \
ALTERNATIVE "", "stac", X86_FEATURE_SMAP
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
static __always_inline void clac(void)
{
@@ -61,6 +61,6 @@ static __always_inline void smap_restore(unsigned long flags)
#define ASM_STAC \
ALTERNATIVE("", "stac", X86_FEATURE_SMAP)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SMAP_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 2ca1da5..0811942 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_SMP_H
#define _ASM_X86_SMP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
#include <linux/thread_info.h>
@@ -175,7 +175,7 @@ extern void nmi_selftest(void);
extern unsigned int smpboot_control;
extern unsigned long apic_mmio_base;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Control bits for startup_64 */
#define STARTUP_READ_APICID 0x80000000
diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
index b4b16da..65394aa 100644
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h
@@ -30,7 +30,7 @@
#define TDX_SUCCESS 0ULL
#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/asm/mce.h>
@@ -126,5 +126,5 @@ static inline int tdx_enable(void) { return -ENODEV; }
static inline const char *tdx_dump_mce_info(struct mce *m) { return NULL; }
#endif /* CONFIG_INTEL_TDX_HOST */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_TDX_H */
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index a55c214..9282465 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -54,7 +54,7 @@
* - this struct should fit entirely inside of one cache line
* - this struct shares the supervisor stack pages
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
#include <asm/cpufeature.h>
#include <linux/atomic.h>
@@ -73,7 +73,7 @@ struct thread_info {
.flags = 0, \
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <asm/asm-offsets.h>
@@ -161,7 +161,7 @@ struct thread_info {
*
* preempt_count needs to be 1 initially, until the scheduler is functional.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Walks up the stack frames to make sure that the specified object is
@@ -213,7 +213,7 @@ static inline int arch_within_stack_frames(const void * const stack,
#endif
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Thread-synchronous status.
@@ -224,7 +224,7 @@ static inline int arch_within_stack_frames(const void * const stack,
*/
#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_COMPAT
#define TS_I386_REGS_POKED 0x0004 /* regs poked by 32-bit ptracer */
@@ -242,6 +242,6 @@ static inline int arch_within_stack_frames(const void * const stack,
extern void arch_setup_new_exec(void);
#define arch_setup_new_exec arch_setup_new_exec
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_THREAD_INFO_H */
diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h
index 85cc57c..8f4579c 100644
--- a/arch/x86/include/asm/unwind_hints.h
+++ b/arch/x86/include/asm/unwind_hints.h
@@ -5,7 +5,7 @@
#include "orc_types.h"
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro UNWIND_HINT_END_OF_STACK
UNWIND_HINT type=UNWIND_HINT_TYPE_END_OF_STACK
@@ -88,6 +88,6 @@
#define UNWIND_HINT_RESTORE \
UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_UNWIND_HINTS_H */
diff --git a/arch/x86/include/asm/vdso/getrandom.h b/arch/x86/include/asm/vdso/getrandom.h
index 2bf9c0e..785f8ed 100644
--- a/arch/x86/include/asm/vdso/getrandom.h
+++ b/arch/x86/include/asm/vdso/getrandom.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_GETRANDOM_H
#define __ASM_VDSO_GETRANDOM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/unistd.h>
@@ -37,6 +37,6 @@ static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void
return &vdso_rng_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETRANDOM_H */
diff --git a/arch/x86/include/asm/vdso/gettimeofday.h b/arch/x86/include/asm/vdso/gettimeofday.h
index 375a34b..428f3f4 100644
--- a/arch/x86/include/asm/vdso/gettimeofday.h
+++ b/arch/x86/include/asm/vdso/gettimeofday.h
@@ -10,7 +10,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/linux/time.h>
#include <asm/vgtod.h>
@@ -350,6 +350,6 @@ static __always_inline u64 vdso_calc_ns(const struct vdso_data *vd, u64 cycles,
}
#define vdso_calc_ns vdso_calc_ns
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/x86/include/asm/vdso/processor.h b/arch/x86/include/asm/vdso/processor.h
index 2cbce97..c9b2ba7 100644
--- a/arch/x86/include/asm/vdso/processor.h
+++ b/arch/x86/include/asm/vdso/processor.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
static __always_inline void rep_nop(void)
@@ -22,6 +22,6 @@ struct getcpu_cache;
notrace long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h
index 37b4a70..72aedeb 100644
--- a/arch/x86/include/asm/vdso/vsyscall.h
+++ b/arch/x86/include/asm/vdso/vsyscall.h
@@ -9,7 +9,7 @@
#define VDSO_PAGE_PVCLOCK_OFFSET 0
#define VDSO_PAGE_HVCLOCK_OFFSET 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
#include <asm/vgtod.h>
@@ -36,6 +36,6 @@ struct vdso_rng_data *__x86_get_k_vdso_rng_data(void)
/* 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 */
diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h
index baca0b0..a078a2b 100644
--- a/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@ -72,7 +72,7 @@
#endif
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Explicitly size integers that represent pfns in the public interface
* with Xen so that on ARM we can have one ABI that works for 32 and 64
* bit guests. */
@@ -137,7 +137,7 @@ DEFINE_GUEST_HANDLE(xen_ulong_t);
#define TI_SET_DPL(_ti, _dpl) ((_ti)->flags |= (_dpl))
#define TI_SET_IF(_ti, _if) ((_ti)->flags |= ((!!(_if))<<2))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct trap_info {
uint8_t vector; /* exception vector */
uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */
@@ -186,7 +186,7 @@ struct arch_shared_info {
uint32_t wc_sec_hi;
#endif
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_X86_32
#include <asm/xen/interface_32.h>
@@ -196,7 +196,7 @@ struct arch_shared_info {
#include <asm/pvclock-abi.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The following is all CPU context. Note that the fpu_ctxt block is filled
* in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used.
@@ -376,7 +376,7 @@ struct xen_pmu_arch {
} c;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Prefix forces emulation of some non-trapping instructions.
diff --git a/arch/x86/include/asm/xen/interface_32.h b/arch/x86/include/asm/xen/interface_32.h
index dc40578..74d9768 100644
--- a/arch/x86/include/asm/xen/interface_32.h
+++ b/arch/x86/include/asm/xen/interface_32.h
@@ -44,7 +44,7 @@
*/
#define __HYPERVISOR_VIRT_START 0xF5800000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct cpu_user_regs {
uint32_t ebx;
@@ -85,7 +85,7 @@ typedef struct xen_callback xen_callback_t;
#define XEN_CALLBACK(__cs, __eip) \
((struct xen_callback){ .cs = (__cs), .eip = (unsigned long)(__eip) })
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
diff --git a/arch/x86/include/asm/xen/interface_64.h b/arch/x86/include/asm/xen/interface_64.h
index c10f279..38a19ed 100644
--- a/arch/x86/include/asm/xen/interface_64.h
+++ b/arch/x86/include/asm/xen/interface_64.h
@@ -77,7 +77,7 @@
#define VGCF_in_syscall (1<<_VGCF_in_syscall)
#define VGCF_IN_SYSCALL VGCF_in_syscall
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct iret_context {
/* Top of stack (%rsp at point of hypercall). */
@@ -143,7 +143,7 @@ typedef unsigned long xen_callback_t;
#define XEN_CALLBACK(__cs, __rip) \
((unsigned long)(__rip))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_XEN_INTERFACE_64_H */
diff --git a/arch/x86/math-emu/control_w.h b/arch/x86/math-emu/control_w.h
index 60f4dcc..93cbc89 100644
--- a/arch/x86/math-emu/control_w.h
+++ b/arch/x86/math-emu/control_w.h
@@ -11,7 +11,7 @@
#ifndef _CONTROLW_H_
#define _CONTROLW_H_
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _Const_(x) $##x
#else
#define _Const_(x) x
diff --git a/arch/x86/math-emu/exception.h b/arch/x86/math-emu/exception.h
index 75230b9..59961d3 100644
--- a/arch/x86/math-emu/exception.h
+++ b/arch/x86/math-emu/exception.h
@@ -10,7 +10,7 @@
#ifndef _EXCEPTION_H_
#define _EXCEPTION_H_
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define Const_(x) $##x
#else
#define Const_(x) x
@@ -37,7 +37,7 @@
#define PRECISION_LOST_UP Const_((EX_Precision | SW_C1))
#define PRECISION_LOST_DOWN Const_(EX_Precision)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef DEBUG
#define EXCEPTION(x) { printk("exception in %s at line %d\n", \
@@ -46,6 +46,6 @@
#define EXCEPTION(x) FPU_exception(x)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _EXCEPTION_H_ */
diff --git a/arch/x86/math-emu/fpu_emu.h b/arch/x86/math-emu/fpu_emu.h
index 0c12222..def569c 100644
--- a/arch/x86/math-emu/fpu_emu.h
+++ b/arch/x86/math-emu/fpu_emu.h
@@ -20,7 +20,7 @@
*/
#define PECULIAR_486
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include "fpu_asm.h"
#define Const(x) $##x
#else
@@ -68,7 +68,7 @@
#define FPU_Exception Const(0x80000000) /* Added to tag returns. */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include "fpu_system.h"
@@ -213,6 +213,6 @@ asmlinkage int FPU_round(FPU_REG *arg, unsigned int extent, int dummy,
#include "fpu_proto.h"
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _FPU_EMU_H_ */
diff --git a/arch/x86/math-emu/status_w.h b/arch/x86/math-emu/status_w.h
index b77bafe..f642957 100644
--- a/arch/x86/math-emu/status_w.h
+++ b/arch/x86/math-emu/status_w.h
@@ -13,7 +13,7 @@
#include "fpu_emu.h" /* for definition of PECULIAR_486 */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define Const__(x) $##x
#else
#define Const__(x) x
@@ -37,7 +37,7 @@
#define SW_Exc_Mask Const__(0x27f) /* Status word exception bit mask */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define COMP_A_gt_B 1
#define COMP_A_eq_B 2
@@ -63,6 +63,6 @@ static inline void setcc(int cc)
# define clear_C1()
#endif /* PECULIAR_486 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _STATUS_H_ */
diff --git a/arch/x86/realmode/rm/realmode.h b/arch/x86/realmode/rm/realmode.h
index c76041a..867e55f 100644
--- a/arch/x86/realmode/rm/realmode.h
+++ b/arch/x86/realmode/rm/realmode.h
@@ -2,7 +2,7 @@
#ifndef ARCH_X86_REALMODE_RM_REALMODE_H
#define ARCH_X86_REALMODE_RM_REALMODE_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* 16-bit ljmpw to the real_mode_seg
@@ -12,7 +12,7 @@
*/
#define LJMPW_RM(to) .byte 0xea ; .word (to), real_mode_seg
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Signature at the end of the realmode region
diff --git a/arch/x86/realmode/rm/wakeup.h b/arch/x86/realmode/rm/wakeup.h
index 0e4fd08..3b6d8fa 100644
--- a/arch/x86/realmode/rm/wakeup.h
+++ b/arch/x86/realmode/rm/wakeup.h
@@ -7,7 +7,7 @@
#ifndef ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
#define ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
/* This must match data at wakeup.S */
diff --git a/tools/arch/x86/include/asm/asm.h b/tools/arch/x86/include/asm/asm.h
index 3ad3da9..dbe39b4 100644
--- a/tools/arch/x86/include/asm/asm.h
+++ b/tools/arch/x86/include/asm/asm.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __ASM_FORM(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__,
@@ -123,7 +123,7 @@
#ifdef __KERNEL__
/* Exception table entry */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
.pushsection "__ex_table","a" ; \
.balign 4 ; \
@@ -154,7 +154,7 @@
# define _ASM_NOKPROBE(entry)
# endif
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
# define _EXPAND_EXTABLE_HANDLE(x) #x
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
" .pushsection \"__ex_table\",\"a\"\n" \
@@ -186,7 +186,7 @@
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
diff --git a/tools/arch/x86/include/asm/nops.h b/tools/arch/x86/include/asm/nops.h
index 1c1b755..cd94221 100644
--- a/tools/arch/x86/include/asm/nops.h
+++ b/tools/arch/x86/include/asm/nops.h
@@ -82,7 +82,7 @@
#define ASM_NOP7 _ASM_BYTES(BYTES_NOP7)
#define ASM_NOP8 _ASM_BYTES(BYTES_NOP8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const unsigned char * const x86_nops[];
#endif
diff --git a/tools/arch/x86/include/asm/orc_types.h b/tools/arch/x86/include/asm/orc_types.h
index 46d7e06..e0125af 100644
--- a/tools/arch/x86/include/asm/orc_types.h
+++ b/tools/arch/x86/include/asm/orc_types.h
@@ -45,7 +45,7 @@
#define ORC_TYPE_REGS 3
#define ORC_TYPE_REGS_PARTIAL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/byteorder.h>
/*
@@ -73,6 +73,6 @@ struct orc_entry {
#endif
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ORC_TYPES_H */
diff --git a/tools/arch/x86/include/asm/pvclock-abi.h b/tools/arch/x86/include/asm/pvclock-abi.h
index 1436226..b9fece5 100644
--- a/tools/arch/x86/include/asm/pvclock-abi.h
+++ b/tools/arch/x86/include/asm/pvclock-abi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These structs MUST NOT be changed.
@@ -44,5 +44,5 @@ struct pvclock_wall_clock {
#define PVCLOCK_GUEST_STOPPED (1 << 1)
/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */
#define PVCLOCK_COUNTS_FROM_ZERO (1 << 2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H */
^ permalink raw reply related [flat|nested] 94+ messages in thread* [tip: x86/core] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers
2025-03-14 7:10 ` [PATCH 37/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
2025-03-14 9:04 ` [tip: x86/merge] x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers tip-bot2 for Thomas Huth
@ 2025-03-19 11:03 ` tip-bot2 for Thomas Huth
1 sibling, 0 replies; 94+ messages in thread
From: tip-bot2 for Thomas Huth @ 2025-03-19 11:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: Thomas Huth, Ingo Molnar, Brian Gerst, Juergen Gross,
H. Peter Anvin, Kees Cook, Linus Torvalds, x86, linux-kernel
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 24a295e4ef1ca8e97d8b7015e1887b6e83e1c8be
Gitweb: https://git.kernel.org/tip/24a295e4ef1ca8e97d8b7015e1887b6e83e1c8be
Author: Thomas Huth <thuth@redhat.com>
AuthorDate: Wed, 19 Mar 2025 11:30:57 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 19 Mar 2025 11:47:30 +01:00
x86/headers: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-UAPI headers
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 mostly a mechanical patch (done with a simple "sed -i"
statement), with some manual tweaks in <asm/frame.h>, <asm/hw_irq.h>
and <asm/setup.h> that mentioned this macro in comments with some
missing underscores.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250314071013.1575167-38-thuth@redhat.com
---
arch/x86/boot/boot.h | 4 ++--
arch/x86/entry/vdso/extable.h | 2 +-
arch/x86/include/asm/alternative.h | 6 +++---
arch/x86/include/asm/asm.h | 10 +++++-----
arch/x86/include/asm/boot.h | 2 +-
arch/x86/include/asm/cpufeature.h | 4 ++--
arch/x86/include/asm/cpumask.h | 4 ++--
arch/x86/include/asm/current.h | 4 ++--
arch/x86/include/asm/desc_defs.h | 4 ++--
arch/x86/include/asm/dwarf2.h | 2 +-
arch/x86/include/asm/fixmap.h | 4 ++--
arch/x86/include/asm/frame.h | 10 +++++-----
arch/x86/include/asm/fred.h | 4 ++--
arch/x86/include/asm/fsgsbase.h | 4 ++--
arch/x86/include/asm/ftrace.h | 8 ++++----
arch/x86/include/asm/hw_irq.h | 4 ++--
arch/x86/include/asm/ibt.h | 12 ++++++------
arch/x86/include/asm/idtentry.h | 6 +++---
arch/x86/include/asm/inst.h | 2 +-
arch/x86/include/asm/irqflags.h | 10 +++++-----
arch/x86/include/asm/jump_label.h | 4 ++--
arch/x86/include/asm/kasan.h | 2 +-
arch/x86/include/asm/kexec.h | 4 ++--
arch/x86/include/asm/linkage.h | 6 +++---
arch/x86/include/asm/mem_encrypt.h | 4 ++--
arch/x86/include/asm/msr.h | 4 ++--
arch/x86/include/asm/nops.h | 2 +-
arch/x86/include/asm/nospec-branch.h | 6 +++---
arch/x86/include/asm/orc_types.h | 4 ++--
arch/x86/include/asm/page.h | 4 ++--
arch/x86/include/asm/page_32.h | 4 ++--
arch/x86/include/asm/page_32_types.h | 4 ++--
arch/x86/include/asm/page_64.h | 4 ++--
arch/x86/include/asm/page_64_types.h | 2 +-
arch/x86/include/asm/page_types.h | 4 ++--
arch/x86/include/asm/paravirt.h | 14 +++++++-------
arch/x86/include/asm/paravirt_types.h | 4 ++--
arch/x86/include/asm/percpu.h | 4 ++--
arch/x86/include/asm/pgtable-2level_types.h | 4 ++--
arch/x86/include/asm/pgtable-3level_types.h | 4 ++--
arch/x86/include/asm/pgtable-invert.h | 4 ++--
arch/x86/include/asm/pgtable.h | 12 ++++++------
arch/x86/include/asm/pgtable_32.h | 4 ++--
arch/x86/include/asm/pgtable_32_areas.h | 2 +-
arch/x86/include/asm/pgtable_64.h | 6 +++---
arch/x86/include/asm/pgtable_64_types.h | 4 ++--
arch/x86/include/asm/pgtable_types.h | 10 +++++-----
arch/x86/include/asm/prom.h | 4 ++--
arch/x86/include/asm/pti.h | 4 ++--
arch/x86/include/asm/ptrace.h | 4 ++--
arch/x86/include/asm/purgatory.h | 4 ++--
arch/x86/include/asm/pvclock-abi.h | 4 ++--
arch/x86/include/asm/realmode.h | 4 ++--
arch/x86/include/asm/segment.h | 8 ++++----
arch/x86/include/asm/setup.h | 6 +++---
arch/x86/include/asm/setup_data.h | 4 ++--
arch/x86/include/asm/shared/tdx.h | 4 ++--
arch/x86/include/asm/shstk.h | 4 ++--
arch/x86/include/asm/signal.h | 8 ++++----
arch/x86/include/asm/smap.h | 6 +++---
arch/x86/include/asm/smp.h | 4 ++--
arch/x86/include/asm/tdx.h | 4 ++--
arch/x86/include/asm/thread_info.h | 12 ++++++------
arch/x86/include/asm/unwind_hints.h | 4 ++--
arch/x86/include/asm/vdso/getrandom.h | 4 ++--
arch/x86/include/asm/vdso/gettimeofday.h | 4 ++--
arch/x86/include/asm/vdso/processor.h | 4 ++--
arch/x86/include/asm/vdso/vsyscall.h | 4 ++--
arch/x86/include/asm/xen/interface.h | 10 +++++-----
arch/x86/include/asm/xen/interface_32.h | 4 ++--
arch/x86/include/asm/xen/interface_64.h | 4 ++--
arch/x86/math-emu/control_w.h | 2 +-
arch/x86/math-emu/exception.h | 6 +++---
arch/x86/math-emu/fpu_emu.h | 6 +++---
arch/x86/math-emu/status_w.h | 6 +++---
arch/x86/realmode/rm/realmode.h | 4 ++--
arch/x86/realmode/rm/wakeup.h | 2 +-
tools/arch/x86/include/asm/asm.h | 8 ++++----
tools/arch/x86/include/asm/nops.h | 2 +-
tools/arch/x86/include/asm/orc_types.h | 4 ++--
tools/arch/x86/include/asm/pvclock-abi.h | 4 ++--
81 files changed, 201 insertions(+), 201 deletions(-)
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 0f24f7e..38f17a1 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -16,7 +16,7 @@
#define STACK_SIZE 1024 /* Minimum number of bytes for stack */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stdarg.h>
#include <linux/types.h>
@@ -327,6 +327,6 @@ void probe_cards(int unsafe);
/* video-vesa.c */
void vesa_store_edid(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* BOOT_BOOT_H */
diff --git a/arch/x86/entry/vdso/extable.h b/arch/x86/entry/vdso/extable.h
index b56f6b0..baba612 100644
--- a/arch/x86/entry/vdso/extable.h
+++ b/arch/x86/entry/vdso/extable.h
@@ -7,7 +7,7 @@
* vDSO uses a dedicated handler the addresses are relative to the overall
* exception table, not each individual entry.
*/
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _ASM_VDSO_EXTABLE_HANDLE(from, to) \
ASM_VDSO_EXTABLE_HANDLE from to
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 6bf1970..69f25e6 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -15,7 +15,7 @@
#define ALT_DIRECT_CALL(feature) ((ALT_FLAG_DIRECT_CALL << ALT_FLAGS_SHIFT) | (feature))
#define ALT_CALL_ALWAYS ALT_DIRECT_CALL(X86_FEATURE_ALWAYS)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stddef.h>
@@ -277,7 +277,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
void BUG_func(void);
void nop_func(void);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_SMP
.macro LOCK_PREFIX
@@ -360,6 +360,6 @@ void nop_func(void);
ALTERNATIVE_2 oldinstr, newinstr_no, X86_FEATURE_ALWAYS, \
newinstr_yes, ft_flags
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_ALTERNATIVE_H */
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 975ae7a..cc28815 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __ASM_FORM(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__,
@@ -113,7 +113,7 @@
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef __pic__
static __always_inline __pure void *rip_rel_ptr(void *p)
{
@@ -144,7 +144,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
# include <asm/extable_fixup_types.h>
/* Exception table entry */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define _ASM_EXTABLE_TYPE(from, to, type) \
.pushsection "__ex_table","a" ; \
@@ -164,7 +164,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
# define _ASM_NOKPROBE(entry)
# endif
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
# define DEFINE_EXTABLE_TYPE_REG \
".macro extable_type_reg type:req reg:req\n" \
@@ -232,7 +232,7 @@ static __always_inline __pure void *rip_rel_ptr(void *p)
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define _ASM_EXTABLE(from, to) \
_ASM_EXTABLE_TYPE(from, to, EX_TYPE_DEFAULT)
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index 3e5b111..3f02ff6 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -74,7 +74,7 @@
# define BOOT_STACK_SIZE 0x1000
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned int output_len;
extern const unsigned long kernel_text_size;
extern const unsigned long kernel_total_size;
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index fe6994f..893cbca 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -4,7 +4,7 @@
#include <asm/processor.h>
-#if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#if defined(__KERNEL__) && !defined(__ASSEMBLER__)
#include <asm/asm.h>
#include <linux/bitops.h>
@@ -137,5 +137,5 @@ t_no:
#define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \
boot_cpu_data.x86_model
-#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
+#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */
#endif /* _ASM_X86_CPUFEATURE_H */
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 4acfd57..70f6b60 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_CPUMASK_H
#define _ASM_X86_CPUMASK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
extern void setup_cpu_local_masks(void);
@@ -34,5 +34,5 @@ static __always_inline void arch_cpumask_clear_cpu(int cpu, struct cpumask *dstp
#define arch_cpu_is_offline(cpu) unlikely(!arch_cpu_online(cpu))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_CPUMASK_H */
diff --git a/arch/x86/include/asm/current.h b/arch/x86/include/asm/current.h
index dea7d8b..cc4a3f7 100644
--- a/arch/x86/include/asm/current.h
+++ b/arch/x86/include/asm/current.h
@@ -5,7 +5,7 @@
#include <linux/build_bug.h>
#include <linux/compiler.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/percpu.h>
@@ -27,6 +27,6 @@ static __always_inline struct task_struct *get_current(void)
#define current get_current()
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_CURRENT_H */
diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
index d440a65..7e6b931 100644
--- a/arch/x86/include/asm/desc_defs.h
+++ b/arch/x86/include/asm/desc_defs.h
@@ -58,7 +58,7 @@
#define DESC_USER (_DESC_DPL(3))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -166,7 +166,7 @@ struct desc_ptr {
unsigned long address;
} __attribute__((packed)) ;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Boot IDT definitions */
#define BOOT_IDT_ENTRIES 32
diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index 430fca1..302e11b 100644
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_DWARF2_H
#define _ASM_X86_DWARF2_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#warning "asm/dwarf2.h should be only included in pure assembly files"
#endif
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index d0dcefb..4519c9f 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -31,7 +31,7 @@
/* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */
#define FIXMAP_PMD_TOP 507
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/kernel.h>
#include <asm/apicdef.h>
#include <asm/page.h>
@@ -196,5 +196,5 @@ void __init *early_memremap_decrypted_wp(resource_size_t phys_addr,
void __early_set_fixmap(enum fixed_addresses idx,
phys_addr_t phys, pgprot_t flags);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_FIXMAP_H */
diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h
index fb42659..0ab6507 100644
--- a/arch/x86/include/asm/frame.h
+++ b/arch/x86/include/asm/frame.h
@@ -11,7 +11,7 @@
#ifdef CONFIG_FRAME_POINTER
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro FRAME_BEGIN
push %_ASM_BP
@@ -51,7 +51,7 @@
.endm
#endif /* CONFIG_X86_64 */
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#define FRAME_BEGIN \
"push %" _ASM_BP "\n" \
@@ -82,18 +82,18 @@ static inline unsigned long encode_frame_pointer(struct pt_regs *regs)
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define FRAME_OFFSET __ASM_SEL(4, 8)
#else /* !CONFIG_FRAME_POINTER */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro ENCODE_FRAME_POINTER ptregs_offset=0
.endm
-#else /* !__ASSEMBLY */
+#else /* !__ASSEMBLER__ */
#define ENCODE_FRAME_POINTER
diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h
index 25ca00b..2a29e52 100644
--- a/arch/x86/include/asm/fred.h
+++ b/arch/x86/include/asm/fred.h
@@ -32,7 +32,7 @@
#define FRED_CONFIG_INT_STKLVL(l) (_AT(unsigned long, l) << 9)
#define FRED_CONFIG_ENTRYPOINT(p) _AT(unsigned long, (p))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_FRED
#include <linux/kernel.h>
@@ -113,6 +113,6 @@ static inline void fred_entry_from_kvm(unsigned int type, unsigned int vector) {
static inline void fred_sync_rsp0(unsigned long rsp0) { }
static inline void fred_update_rsp0(void) { }
#endif /* CONFIG_X86_FRED */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* ASM_X86_FRED_H */
diff --git a/arch/x86/include/asm/fsgsbase.h b/arch/x86/include/asm/fsgsbase.h
index 9e7e8ca..02f2395 100644
--- a/arch/x86/include/asm/fsgsbase.h
+++ b/arch/x86/include/asm/fsgsbase.h
@@ -2,7 +2,7 @@
#ifndef _ASM_FSGSBASE_H
#define _ASM_FSGSBASE_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_64
@@ -80,6 +80,6 @@ extern unsigned long x86_fsgsbase_read_task(struct task_struct *task,
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_FSGSBASE_H */
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index f226524..93156ac 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -22,7 +22,7 @@
#define ARCH_SUPPORTS_FTRACE_OPS 1
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void __fentry__(void);
static inline unsigned long ftrace_call_adjust(unsigned long addr)
@@ -106,11 +106,11 @@ struct dyn_arch_ftrace {
};
#endif /* CONFIG_DYNAMIC_FTRACE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_FUNCTION_TRACER */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
void prepare_ftrace_return(unsigned long ip, unsigned long *parent,
unsigned long frame_pointer);
@@ -154,6 +154,6 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)
}
#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_IA32_EMULATION */
#endif /* !COMPILE_OFFSETS */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_FTRACE_H */
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index edebf10..162ebd7 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -16,7 +16,7 @@
#include <asm/irq_vectors.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/percpu.h>
#include <linux/profile.h>
@@ -128,6 +128,6 @@ extern char spurious_entries_start[];
typedef struct irq_desc* vector_irq_t[NR_VECTORS];
DECLARE_PER_CPU(vector_irq_t, vector_irq);
-#endif /* !ASSEMBLY_ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_HW_IRQ_H */
diff --git a/arch/x86/include/asm/ibt.h b/arch/x86/include/asm/ibt.h
index 9423a29..28d8452 100644
--- a/arch/x86/include/asm/ibt.h
+++ b/arch/x86/include/asm/ibt.h
@@ -21,7 +21,7 @@
#define HAS_KERNEL_IBT 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_X86_64
#define ASM_ENDBR "endbr64\n\t"
@@ -82,7 +82,7 @@ extern __noendbr bool is_endbr(u32 *val);
extern __noendbr u64 ibt_save(bool disable);
extern __noendbr void ibt_restore(u64 save);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_X86_64
#define ENDBR endbr64
@@ -90,13 +90,13 @@ extern __noendbr void ibt_restore(u64 save);
#define ENDBR endbr32
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* !IBT */
#define HAS_KERNEL_IBT 0
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define ASM_ENDBR
#define IBT_NOSEAL(name)
@@ -108,11 +108,11 @@ static inline bool is_endbr(u32 *val) { return false; }
static inline u64 ibt_save(bool disable) { return 0; }
static inline void ibt_restore(u64 save) { }
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define ENDBR
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_X86_KERNEL_IBT */
diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
index ad5c68f..a4ec27c 100644
--- a/arch/x86/include/asm/idtentry.h
+++ b/arch/x86/include/asm/idtentry.h
@@ -7,7 +7,7 @@
#define IDT_ALIGN (8 * (1 + HAS_KERNEL_IBT))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/entry-common.h>
#include <linux/hardirq.h>
@@ -474,7 +474,7 @@ static inline void fred_install_sysvec(unsigned int vector, const idtentry_t fun
idt_install_sysvec(vector, asm_##function); \
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
/*
* The ASM variants for DECLARE_IDTENTRY*() which emit the ASM entry stubs.
@@ -579,7 +579,7 @@ SYM_CODE_START(spurious_entries_start)
SYM_CODE_END(spurious_entries_start)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* The actual entry points. Note that DECLARE_IDTENTRY*() serves two
diff --git a/arch/x86/include/asm/inst.h b/arch/x86/include/asm/inst.h
index 438ccd4..e48a00b 100644
--- a/arch/x86/include/asm/inst.h
+++ b/arch/x86/include/asm/inst.h
@@ -6,7 +6,7 @@
#ifndef X86_ASM_INST_H
#define X86_ASM_INST_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define REG_NUM_INVALID 100
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index cf7fc2b..abb8374 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -4,7 +4,7 @@
#include <asm/processor-flags.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/nospec-branch.h>
@@ -79,7 +79,7 @@ static __always_inline void native_local_irq_restore(unsigned long flags)
#ifdef CONFIG_PARAVIRT_XXL
#include <asm/paravirt.h>
#else
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
static __always_inline unsigned long arch_local_save_flags(void)
@@ -133,10 +133,10 @@ static __always_inline unsigned long arch_local_irq_save(void)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_PARAVIRT_XXL */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static __always_inline int arch_irqs_disabled_flags(unsigned long flags)
{
return !(flags & X86_EFLAGS_IF);
@@ -154,6 +154,6 @@ static __always_inline void arch_local_irq_restore(unsigned long flags)
if (!arch_irqs_disabled_flags(flags))
arch_local_irq_enable();
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index 3f1c1d6..61dd1de 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -7,7 +7,7 @@
#include <asm/asm.h>
#include <asm/nops.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/stringify.h>
#include <linux/types.h>
@@ -55,6 +55,6 @@ l_yes:
extern int arch_jump_entry_size(struct jump_entry *entry);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h
index de75306..d7e33c7 100644
--- a/arch/x86/include/asm/kasan.h
+++ b/arch/x86/include/asm/kasan.h
@@ -23,7 +23,7 @@
(1ULL << (__VIRTUAL_MASK_SHIFT - \
KASAN_SHADOW_SCALE_SHIFT)))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_KASAN
void __init kasan_early_init(void);
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index e3589d6..5432457 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -13,7 +13,7 @@
# define KEXEC_CONTROL_PAGE_SIZE 4096
# define KEXEC_CONTROL_CODE_MAX_SIZE 2048
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/string.h>
#include <linux/kernel.h>
@@ -217,6 +217,6 @@ unsigned int arch_crash_get_elfcorehdr_size(void);
#define crash_get_elfcorehdr_size arch_crash_get_elfcorehdr_size
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_KEXEC_H */
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index 4835c67..b51d8a4 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -38,7 +38,7 @@
#define ASM_FUNC_ALIGN __stringify(__FUNC_ALIGN)
#define SYM_F_ALIGN __FUNC_ALIGN
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
#define RET jmp __x86_return_thunk
@@ -50,7 +50,7 @@
#endif
#endif /* CONFIG_MITIGATION_RETPOLINE */
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#if defined(CONFIG_MITIGATION_RETHUNK) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
#define ASM_RET "jmp __x86_return_thunk\n\t"
@@ -62,7 +62,7 @@
#endif
#endif /* CONFIG_MITIGATION_RETPOLINE */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Depending on -fpatchable-function-entry=N,N usage (CONFIG_CALL_PADDING) the
diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
index f922b68..1530ee3 100644
--- a/arch/x86/include/asm/mem_encrypt.h
+++ b/arch/x86/include/asm/mem_encrypt.h
@@ -10,7 +10,7 @@
#ifndef __X86_MEM_ENCRYPT_H__
#define __X86_MEM_ENCRYPT_H__
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/init.h>
#include <linux/cc_platform.h>
@@ -114,6 +114,6 @@ void add_encrypt_protection_map(void);
extern char __start_bss_decrypted[], __end_bss_decrypted[], __start_bss_decrypted_unused[];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __X86_MEM_ENCRYPT_H__ */
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 0018535..9397a31 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -4,7 +4,7 @@
#include "msr-index.h"
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/asm.h>
#include <asm/errno.h>
@@ -397,5 +397,5 @@ static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])
return wrmsr_safe_regs(regs);
}
#endif /* CONFIG_SMP */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_MSR_H */
diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h
index 1c1b755..cd94221 100644
--- a/arch/x86/include/asm/nops.h
+++ b/arch/x86/include/asm/nops.h
@@ -82,7 +82,7 @@
#define ASM_NOP7 _ASM_BYTES(BYTES_NOP7)
#define ASM_NOP8 _ASM_BYTES(BYTES_NOP8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const unsigned char * const x86_nops[];
#endif
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 44c6076..804b66a 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -176,7 +176,7 @@
add $(BITS_PER_LONG/8), %_ASM_SP; \
lfence;
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* (ab)use RETPOLINE_SAFE on RET to annotate away 'bare' RET instructions
@@ -334,7 +334,7 @@
#define CLEAR_BRANCH_HISTORY_VMEXIT
#endif
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];
extern retpoline_thunk_t __x86_indirect_thunk_array[];
@@ -603,6 +603,6 @@ static __always_inline void mds_idle_clear_cpu_buffers(void)
mds_clear_cpu_buffers();
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_NOSPEC_BRANCH_H_ */
diff --git a/arch/x86/include/asm/orc_types.h b/arch/x86/include/asm/orc_types.h
index 46d7e06..e0125af 100644
--- a/arch/x86/include/asm/orc_types.h
+++ b/arch/x86/include/asm/orc_types.h
@@ -45,7 +45,7 @@
#define ORC_TYPE_REGS 3
#define ORC_TYPE_REGS_PARTIAL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/byteorder.h>
/*
@@ -73,6 +73,6 @@ struct orc_entry {
#endif
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ORC_TYPES_H */
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index c9fe207..9265f2f 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -14,7 +14,7 @@
#include <asm/page_32.h>
#endif /* CONFIG_X86_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct page;
@@ -84,7 +84,7 @@ static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits)
return __canonical_address(vaddr, vaddr_bits) == vaddr;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <asm-generic/memory_model.h>
#include <asm-generic/getorder.h>
diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
index 580d71a..0c62370 100644
--- a/arch/x86/include/asm/page_32.h
+++ b/arch/x86/include/asm/page_32.h
@@ -4,7 +4,7 @@
#include <asm/page_32_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET)
#ifdef CONFIG_DEBUG_VIRTUAL
@@ -26,6 +26,6 @@ static inline void copy_page(void *to, void *from)
{
memcpy(to, from, PAGE_SIZE);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_32_H */
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index 25c3265..a9b62e0 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -63,7 +63,7 @@
*/
#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This much address space is reserved for vmalloc() and iomap()
@@ -75,6 +75,6 @@ extern int sysctl_legacy_va_layout;
extern void find_low_pfn_range(void);
extern void setup_bootmem_allocator(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_32_DEFS_H */
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index b5279f5..d3aab6f 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -4,7 +4,7 @@
#include <asm/page_64_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/cpufeatures.h>
#include <asm/alternative.h>
@@ -95,7 +95,7 @@ static __always_inline unsigned long task_size_max(void)
}
#endif /* CONFIG_X86_5LEVEL */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_X86_VSYSCALL_EMULATION
# define __HAVE_ARCH_GATE_AREA 1
diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 06ef254..1faa8f8 100644
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PAGE_64_DEFS_H
#define _ASM_X86_PAGE_64_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/kaslr.h>
#endif
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 9746889..9f77bf0 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -43,7 +43,7 @@
#define IOREMAP_MAX_ORDER (PMD_SHIFT)
#endif /* CONFIG_X86_64 */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_DYNAMIC_PHYSICAL_MASK
extern phys_addr_t physical_mask;
@@ -66,6 +66,6 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);
extern void initmem_init(void);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PAGE_DEFS_H */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 38a632a..bed346b 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -6,7 +6,7 @@
#include <asm/paravirt_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct mm_struct;
#endif
@@ -15,7 +15,7 @@ struct mm_struct;
#include <asm/asm.h>
#include <asm/nospec-branch.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bug.h>
#include <linux/types.h>
#include <linux/cpumask.h>
@@ -715,7 +715,7 @@ static __always_inline unsigned long arch_local_irq_save(void)
extern void default_banner(void);
void native_pv_lock_init(void) __init;
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#ifdef CONFIG_X86_64
#ifdef CONFIG_PARAVIRT_XXL
@@ -735,18 +735,18 @@ void native_pv_lock_init(void) __init;
#endif /* CONFIG_PARAVIRT_XXL */
#endif /* CONFIG_X86_64 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#else /* CONFIG_PARAVIRT */
# define default_banner x86_init_noop
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
static inline void native_pv_lock_init(void)
{
}
#endif
#endif /* !CONFIG_PARAVIRT */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifndef CONFIG_PARAVIRT_XXL
static inline void paravirt_enter_mmap(struct mm_struct *mm)
{
@@ -764,5 +764,5 @@ static inline void paravirt_set_cap(void)
{
}
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PARAVIRT_H */
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 127a372..6291202 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -4,7 +4,7 @@
#ifdef CONFIG_PARAVIRT
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/desc_defs.h>
@@ -525,7 +525,7 @@ unsigned long pv_native_read_cr2(void);
#define paravirt_nop ((void *)nop_func)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define ALT_NOT_XEN ALT_NOT(X86_FEATURE_XENPV)
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 462d071..105db2d 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -10,7 +10,7 @@
# define __percpu_rel
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#ifdef CONFIG_SMP
# define __percpu %__percpu_seg:
@@ -588,7 +588,7 @@ do { \
/* We can use this directly for local CPU (faster). */
DECLARE_PER_CPU_CACHE_HOT(unsigned long, this_cpu_off);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/pgtable-2level_types.h b/arch/x86/include/asm/pgtable-2level_types.h
index 4a12c27..6642542 100644
--- a/arch/x86/include/asm/pgtable-2level_types.h
+++ b/arch/x86/include/asm/pgtable-2level_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PGTABLE_2LEVEL_DEFS_H
#define _ASM_X86_PGTABLE_2LEVEL_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
typedef unsigned long pteval_t;
@@ -16,7 +16,7 @@ typedef union {
pteval_t pte;
pteval_t pte_low;
} pte_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD 0
diff --git a/arch/x86/include/asm/pgtable-3level_types.h b/arch/x86/include/asm/pgtable-3level_types.h
index 8091134..9d5b257 100644
--- a/arch/x86/include/asm/pgtable-3level_types.h
+++ b/arch/x86/include/asm/pgtable-3level_types.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H
#define _ASM_X86_PGTABLE_3LEVEL_DEFS_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
typedef u64 pteval_t;
@@ -25,7 +25,7 @@ typedef union {
};
pmdval_t pmd;
} pmd_t;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD (!static_cpu_has(X86_FEATURE_PTI))
diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h
index a0c1525..e12e52a 100644
--- a/arch/x86/include/asm/pgtable-invert.h
+++ b/arch/x86/include/asm/pgtable-invert.h
@@ -2,7 +2,7 @@
#ifndef _ASM_PGTABLE_INVERT_H
#define _ASM_PGTABLE_INVERT_H 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* A clear pte value is special, and doesn't get inverted.
@@ -36,6 +36,6 @@ static inline u64 flip_protnone_guard(u64 oldval, u64 val, u64 mask)
return val;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 593f10a..7bd6bd6 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -15,7 +15,7 @@
cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS))) \
: (prot))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/spinlock.h>
#include <asm/x86_init.h>
#include <asm/pkru.h>
@@ -973,7 +973,7 @@ static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
}
#endif /* CONFIG_MITIGATION_PAGE_TABLE_ISOLATION */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_X86_32
@@ -982,7 +982,7 @@ static inline pgd_t pti_set_user_pgtbl(pgd_t *pgdp, pgd_t pgd)
# include <asm/pgtable_64.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/mm_types.h>
#include <linux/mmdebug.h>
#include <linux/log2.h>
@@ -1233,12 +1233,12 @@ static inline int pgd_none(pgd_t pgd)
}
#endif /* CONFIG_PGTABLE_LEVELS > 4 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
#define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern int direct_gbpages;
void init_mem_mapping(void);
@@ -1812,6 +1812,6 @@ bool arch_is_platform_page(u64 paddr);
WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \
set_pgd(pgdp, pgd); \
})
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_H */
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
index 7d4ad89..b612cc5 100644
--- a/arch/x86/include/asm/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
@@ -13,7 +13,7 @@
* This file contains the functions and defines necessary to modify and use
* the i386 page table tree.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/processor.h>
#include <linux/threads.h>
#include <asm/paravirt.h>
@@ -45,7 +45,7 @@ do { \
flush_tlb_one_kernel((vaddr)); \
} while (0)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* This is used to calculate the .brk reservation for initial pagetables.
diff --git a/arch/x86/include/asm/pgtable_32_areas.h b/arch/x86/include/asm/pgtable_32_areas.h
index b635541..921148b 100644
--- a/arch/x86/include/asm/pgtable_32_areas.h
+++ b/arch/x86/include/asm/pgtable_32_areas.h
@@ -13,7 +13,7 @@
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern bool __vmalloc_start_set; /* set once high_memory is set */
#endif
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index d1426b6..b89f8f1 100644
--- a/arch/x86/include/asm/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
@@ -5,7 +5,7 @@
#include <linux/const.h>
#include <asm/pgtable_64_types.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* This file contains the functions and defines necessary to modify and use
@@ -270,7 +270,7 @@ static inline bool gup_fast_permitted(unsigned long start, unsigned long end)
#include <asm/pgtable-invert.h>
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
#define l4_index(x) (((x) >> 39) & 511)
#define pud_index(x) (((x) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
@@ -291,5 +291,5 @@ L3_START_KERNEL = pud_index(__START_KERNEL_map)
i = i + 1 ; \
.endr
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_64_H */
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index ec68f83..5bb782d 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -4,7 +4,7 @@
#include <asm/sparsemem.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/kaslr.h>
@@ -44,7 +44,7 @@ static inline bool pgtable_l5_enabled(void)
extern unsigned int pgdir_shift;
extern unsigned int ptrs_per_p4d;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#define SHARED_KERNEL_PMD 0
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index c90e9c5..b2ed819 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -166,7 +166,7 @@
* to have the WB mode at index 0 (all bits clear). This is the default
* right now and likely would break too much if changed.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
enum page_cache_mode {
_PAGE_CACHE_MODE_WB = 0,
_PAGE_CACHE_MODE_WC = 1,
@@ -241,7 +241,7 @@ enum page_cache_mode {
#define __PAGE_KERNEL_IO_NOCACHE __PAGE_KERNEL_NOCACHE
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __PAGE_KERNEL_ENC (__PAGE_KERNEL | _ENC)
#define __PAGE_KERNEL_ENC_WP (__PAGE_KERNEL_WP | _ENC)
@@ -264,7 +264,7 @@ enum page_cache_mode {
#define PAGE_KERNEL_IO __pgprot_mask(__PAGE_KERNEL_IO)
#define PAGE_KERNEL_IO_NOCACHE __pgprot_mask(__PAGE_KERNEL_IO_NOCACHE)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* early identity mapping pte attrib macros.
@@ -283,7 +283,7 @@ enum page_cache_mode {
# include <asm/pgtable_64_types.h>
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -582,6 +582,6 @@ extern int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn,
unsigned long page_flags);
extern int __init kernel_unmap_pages_in_pgd(pgd_t *pgd, unsigned long address,
unsigned long numpages);
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PGTABLE_DEFS_H */
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 365798c..5d0dbab 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -8,7 +8,7 @@
#ifndef _ASM_X86_PROM_H
#define _ASM_X86_PROM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/of.h>
#include <linux/types.h>
@@ -33,5 +33,5 @@ static inline void x86_flattree_get_config(void) { }
extern char cmd_line[COMMAND_LINE_SIZE];
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/x86/include/asm/pti.h b/arch/x86/include/asm/pti.h
index ab167c9..88d0a1a 100644
--- a/arch/x86/include/asm/pti.h
+++ b/arch/x86/include/asm/pti.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PTI_H
#define _ASM_X86_PTI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
extern void pti_init(void);
@@ -11,5 +11,5 @@ extern void pti_finalize(void);
static inline void pti_check_boottime_disable(void) { }
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PTI_H */
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 5a83fbd..50f7546 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -6,7 +6,7 @@
#include <asm/page_types.h>
#include <uapi/asm/ptrace.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef __i386__
struct pt_regs {
@@ -469,5 +469,5 @@ extern int do_set_thread_area(struct task_struct *p, int idx,
# define do_set_thread_area_64(p, s, t) (0)
#endif
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_PTRACE_H */
diff --git a/arch/x86/include/asm/purgatory.h b/arch/x86/include/asm/purgatory.h
index 5528e93..2fee5e9 100644
--- a/arch/x86/include/asm/purgatory.h
+++ b/arch/x86/include/asm/purgatory.h
@@ -2,10 +2,10 @@
#ifndef _ASM_X86_PURGATORY_H
#define _ASM_X86_PURGATORY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/purgatory.h>
extern void purgatory(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_PURGATORY_H */
diff --git a/arch/x86/include/asm/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h
index 1436226..b9fece5 100644
--- a/arch/x86/include/asm/pvclock-abi.h
+++ b/arch/x86/include/asm/pvclock-abi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These structs MUST NOT be changed.
@@ -44,5 +44,5 @@ struct pvclock_wall_clock {
#define PVCLOCK_GUEST_STOPPED (1 << 1)
/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */
#define PVCLOCK_COUNTS_FROM_ZERO (1 << 2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H */
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index 87e5482..f607081 100644
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -9,7 +9,7 @@
#define TH_FLAGS_SME_ACTIVE_BIT 0
#define TH_FLAGS_SME_ACTIVE BIT(TH_FLAGS_SME_ACTIVE_BIT)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
#include <asm/io.h>
@@ -95,6 +95,6 @@ void reserve_real_mode(void);
void load_trampoline_pgtable(void);
void init_real_mode(void);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ARCH_X86_REALMODE_H */
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index 9d6411c..77d8f49 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -233,7 +233,7 @@
#define VDSO_CPUNODE_BITS 12
#define VDSO_CPUNODE_MASK 0xfff
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Helper functions to store/load CPU and node numbers */
@@ -265,7 +265,7 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
*node = (p >> VDSO_CPUNODE_BITS);
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef __KERNEL__
@@ -286,7 +286,7 @@ static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
*/
#define XEN_EARLY_IDT_HANDLER_SIZE (8 + ENDBR_INSN_SIZE)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const char early_idt_handler_array[NUM_EXCEPTION_VECTORS][EARLY_IDT_HANDLER_SIZE];
extern void early_ignore_irq(void);
@@ -350,7 +350,7 @@ static inline void __loadsegment_fs(unsigned short value)
#define savesegment(seg, value) \
asm("mov %%" #seg ",%0":"=r" (value) : : "memory")
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __KERNEL__ */
#endif /* _ASM_X86_SEGMENT_H */
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index a8d676b..ad9212d 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -27,7 +27,7 @@
#define OLD_CL_ADDRESS 0x020 /* Relative to real mode data */
#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cache.h>
#include <asm/bootparam.h>
@@ -142,7 +142,7 @@ extern bool builtin_cmdline_added __ro_after_init;
#define builtin_cmdline_added 0
#endif
-#else /* __ASSEMBLY */
+#else /* __ASSEMBLER__ */
.macro __RESERVE_BRK name, size
.pushsection .bss..brk, "aw"
@@ -154,6 +154,6 @@ SYM_DATA_END(__brk_\name)
#define RESERVE_BRK(name, size) __RESERVE_BRK name, size
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SETUP_H */
diff --git a/arch/x86/include/asm/setup_data.h b/arch/x86/include/asm/setup_data.h
index 77c5111..7bb16f8 100644
--- a/arch/x86/include/asm/setup_data.h
+++ b/arch/x86/include/asm/setup_data.h
@@ -4,7 +4,7 @@
#include <uapi/asm/setup_data.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct pci_setup_rom {
struct setup_data data;
@@ -27,6 +27,6 @@ struct efi_setup_data {
u64 reserved[8];
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SETUP_DATA_H */
diff --git a/arch/x86/include/asm/shared/tdx.h b/arch/x86/include/asm/shared/tdx.h
index fcbbef4..a28ff6b 100644
--- a/arch/x86/include/asm/shared/tdx.h
+++ b/arch/x86/include/asm/shared/tdx.h
@@ -106,7 +106,7 @@
#define TDX_PS_1G 2
#define TDX_PS_NR (TDX_PS_1G + 1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/compiler_attributes.h>
@@ -177,5 +177,5 @@ static __always_inline u64 hcall_func(u64 exit_reason)
return exit_reason;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_SHARED_TDX_H */
diff --git a/arch/x86/include/asm/shstk.h b/arch/x86/include/asm/shstk.h
index 4cb77e0..ba6f2fe 100644
--- a/arch/x86/include/asm/shstk.h
+++ b/arch/x86/include/asm/shstk.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_SHSTK_H
#define _ASM_X86_SHSTK_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
struct task_struct;
@@ -37,6 +37,6 @@ static inline int shstk_update_last_frame(unsigned long val) { return 0; }
static inline bool shstk_is_enabled(void) { return false; }
#endif /* CONFIG_X86_USER_SHADOW_STACK */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SHSTK_H */
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index 4a4043c..c72d461 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_SIGNAL_H
#define _ASM_X86_SIGNAL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/linkage.h>
/* Most things should be clean enough to redefine this at will, if care
@@ -28,9 +28,9 @@ typedef struct {
#define SA_IA32_ABI 0x02000000u
#define SA_X32_ABI 0x01000000u
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <uapi/asm/signal.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __ARCH_HAS_SA_RESTORER
@@ -101,5 +101,5 @@ struct pt_regs;
#endif /* !__i386__ */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SIGNAL_H */
diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
index 2de1e5a..daea94c 100644
--- a/arch/x86/include/asm/smap.h
+++ b/arch/x86/include/asm/smap.h
@@ -13,7 +13,7 @@
#include <asm/cpufeatures.h>
#include <asm/alternative.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define ASM_CLAC \
ALTERNATIVE "", "clac", X86_FEATURE_SMAP
@@ -21,7 +21,7 @@
#define ASM_STAC \
ALTERNATIVE "", "stac", X86_FEATURE_SMAP
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
static __always_inline void clac(void)
{
@@ -61,6 +61,6 @@ static __always_inline void smap_restore(unsigned long flags)
#define ASM_STAC \
ALTERNATIVE("", "stac", X86_FEATURE_SMAP)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_SMAP_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index bcfa002..0c1c680 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_SMP_H
#define _ASM_X86_SMP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/cpumask.h>
#include <linux/thread_info.h>
@@ -171,7 +171,7 @@ extern void nmi_selftest(void);
extern unsigned int smpboot_control;
extern unsigned long apic_mmio_base;
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/* Control bits for startup_64 */
#define STARTUP_READ_APICID 0x80000000
diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
index b4b16da..65394aa 100644
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h
@@ -30,7 +30,7 @@
#define TDX_SUCCESS 0ULL
#define TDX_RND_NO_ENTROPY 0x8000020300000000ULL
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/asm/mce.h>
@@ -126,5 +126,5 @@ static inline int tdx_enable(void) { return -ENODEV; }
static inline const char *tdx_dump_mce_info(struct mce *m) { return NULL; }
#endif /* CONFIG_INTEL_TDX_HOST */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_TDX_H */
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index a55c214..9282465 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -54,7 +54,7 @@
* - this struct should fit entirely inside of one cache line
* - this struct shares the supervisor stack pages
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct task_struct;
#include <asm/cpufeature.h>
#include <linux/atomic.h>
@@ -73,7 +73,7 @@ struct thread_info {
.flags = 0, \
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
#include <asm/asm-offsets.h>
@@ -161,7 +161,7 @@ struct thread_info {
*
* preempt_count needs to be 1 initially, until the scheduler is functional.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Walks up the stack frames to make sure that the specified object is
@@ -213,7 +213,7 @@ static inline int arch_within_stack_frames(const void * const stack,
#endif
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Thread-synchronous status.
@@ -224,7 +224,7 @@ static inline int arch_within_stack_frames(const void * const stack,
*/
#define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_COMPAT
#define TS_I386_REGS_POKED 0x0004 /* regs poked by 32-bit ptracer */
@@ -242,6 +242,6 @@ static inline int arch_within_stack_frames(const void * const stack,
extern void arch_setup_new_exec(void);
#define arch_setup_new_exec arch_setup_new_exec
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_THREAD_INFO_H */
diff --git a/arch/x86/include/asm/unwind_hints.h b/arch/x86/include/asm/unwind_hints.h
index 85cc57c..8f4579c 100644
--- a/arch/x86/include/asm/unwind_hints.h
+++ b/arch/x86/include/asm/unwind_hints.h
@@ -5,7 +5,7 @@
#include "orc_types.h"
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
.macro UNWIND_HINT_END_OF_STACK
UNWIND_HINT type=UNWIND_HINT_TYPE_END_OF_STACK
@@ -88,6 +88,6 @@
#define UNWIND_HINT_RESTORE \
UNWIND_HINT(UNWIND_HINT_TYPE_RESTORE, 0, 0, 0)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_UNWIND_HINTS_H */
diff --git a/arch/x86/include/asm/vdso/getrandom.h b/arch/x86/include/asm/vdso/getrandom.h
index 2bf9c0e..785f8ed 100644
--- a/arch/x86/include/asm/vdso/getrandom.h
+++ b/arch/x86/include/asm/vdso/getrandom.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_GETRANDOM_H
#define __ASM_VDSO_GETRANDOM_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/unistd.h>
@@ -37,6 +37,6 @@ static __always_inline const struct vdso_rng_data *__arch_get_vdso_rng_data(void
return &vdso_rng_data;
}
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETRANDOM_H */
diff --git a/arch/x86/include/asm/vdso/gettimeofday.h b/arch/x86/include/asm/vdso/gettimeofday.h
index 375a34b..428f3f4 100644
--- a/arch/x86/include/asm/vdso/gettimeofday.h
+++ b/arch/x86/include/asm/vdso/gettimeofday.h
@@ -10,7 +10,7 @@
#ifndef __ASM_VDSO_GETTIMEOFDAY_H
#define __ASM_VDSO_GETTIMEOFDAY_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <uapi/linux/time.h>
#include <asm/vgtod.h>
@@ -350,6 +350,6 @@ static __always_inline u64 vdso_calc_ns(const struct vdso_data *vd, u64 cycles,
}
#define vdso_calc_ns vdso_calc_ns
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* __ASM_VDSO_GETTIMEOFDAY_H */
diff --git a/arch/x86/include/asm/vdso/processor.h b/arch/x86/include/asm/vdso/processor.h
index 2cbce97..c9b2ba7 100644
--- a/arch/x86/include/asm/vdso/processor.h
+++ b/arch/x86/include/asm/vdso/processor.h
@@ -5,7 +5,7 @@
#ifndef __ASM_VDSO_PROCESSOR_H
#define __ASM_VDSO_PROCESSOR_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
static __always_inline void rep_nop(void)
@@ -22,6 +22,6 @@ struct getcpu_cache;
notrace long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused);
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __ASM_VDSO_PROCESSOR_H */
diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h
index 37b4a70..72aedeb 100644
--- a/arch/x86/include/asm/vdso/vsyscall.h
+++ b/arch/x86/include/asm/vdso/vsyscall.h
@@ -9,7 +9,7 @@
#define VDSO_PAGE_PVCLOCK_OFFSET 0
#define VDSO_PAGE_HVCLOCK_OFFSET 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <vdso/datapage.h>
#include <asm/vgtod.h>
@@ -36,6 +36,6 @@ struct vdso_rng_data *__x86_get_k_vdso_rng_data(void)
/* 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 */
diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h
index baca0b0..a078a2b 100644
--- a/arch/x86/include/asm/xen/interface.h
+++ b/arch/x86/include/asm/xen/interface.h
@@ -72,7 +72,7 @@
#endif
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* Explicitly size integers that represent pfns in the public interface
* with Xen so that on ARM we can have one ABI that works for 32 and 64
* bit guests. */
@@ -137,7 +137,7 @@ DEFINE_GUEST_HANDLE(xen_ulong_t);
#define TI_SET_DPL(_ti, _dpl) ((_ti)->flags |= (_dpl))
#define TI_SET_IF(_ti, _if) ((_ti)->flags |= ((!!(_if))<<2))
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct trap_info {
uint8_t vector; /* exception vector */
uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */
@@ -186,7 +186,7 @@ struct arch_shared_info {
uint32_t wc_sec_hi;
#endif
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#ifdef CONFIG_X86_32
#include <asm/xen/interface_32.h>
@@ -196,7 +196,7 @@ struct arch_shared_info {
#include <asm/pvclock-abi.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* The following is all CPU context. Note that the fpu_ctxt block is filled
* in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used.
@@ -376,7 +376,7 @@ struct xen_pmu_arch {
} c;
};
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
* Prefix forces emulation of some non-trapping instructions.
diff --git a/arch/x86/include/asm/xen/interface_32.h b/arch/x86/include/asm/xen/interface_32.h
index dc40578..74d9768 100644
--- a/arch/x86/include/asm/xen/interface_32.h
+++ b/arch/x86/include/asm/xen/interface_32.h
@@ -44,7 +44,7 @@
*/
#define __HYPERVISOR_VIRT_START 0xF5800000
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct cpu_user_regs {
uint32_t ebx;
@@ -85,7 +85,7 @@ typedef struct xen_callback xen_callback_t;
#define XEN_CALLBACK(__cs, __eip) \
((struct xen_callback){ .cs = (__cs), .eip = (unsigned long)(__eip) })
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
/*
diff --git a/arch/x86/include/asm/xen/interface_64.h b/arch/x86/include/asm/xen/interface_64.h
index c10f279..38a19ed 100644
--- a/arch/x86/include/asm/xen/interface_64.h
+++ b/arch/x86/include/asm/xen/interface_64.h
@@ -77,7 +77,7 @@
#define VGCF_in_syscall (1<<_VGCF_in_syscall)
#define VGCF_IN_SYSCALL VGCF_in_syscall
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct iret_context {
/* Top of stack (%rsp at point of hypercall). */
@@ -143,7 +143,7 @@ typedef unsigned long xen_callback_t;
#define XEN_CALLBACK(__cs, __rip) \
((unsigned long)(__rip))
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _ASM_X86_XEN_INTERFACE_64_H */
diff --git a/arch/x86/math-emu/control_w.h b/arch/x86/math-emu/control_w.h
index 60f4dcc..93cbc89 100644
--- a/arch/x86/math-emu/control_w.h
+++ b/arch/x86/math-emu/control_w.h
@@ -11,7 +11,7 @@
#ifndef _CONTROLW_H_
#define _CONTROLW_H_
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define _Const_(x) $##x
#else
#define _Const_(x) x
diff --git a/arch/x86/math-emu/exception.h b/arch/x86/math-emu/exception.h
index 75230b9..59961d3 100644
--- a/arch/x86/math-emu/exception.h
+++ b/arch/x86/math-emu/exception.h
@@ -10,7 +10,7 @@
#ifndef _EXCEPTION_H_
#define _EXCEPTION_H_
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define Const_(x) $##x
#else
#define Const_(x) x
@@ -37,7 +37,7 @@
#define PRECISION_LOST_UP Const_((EX_Precision | SW_C1))
#define PRECISION_LOST_DOWN Const_(EX_Precision)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef DEBUG
#define EXCEPTION(x) { printk("exception in %s at line %d\n", \
@@ -46,6 +46,6 @@
#define EXCEPTION(x) FPU_exception(x)
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _EXCEPTION_H_ */
diff --git a/arch/x86/math-emu/fpu_emu.h b/arch/x86/math-emu/fpu_emu.h
index 0c12222..def569c 100644
--- a/arch/x86/math-emu/fpu_emu.h
+++ b/arch/x86/math-emu/fpu_emu.h
@@ -20,7 +20,7 @@
*/
#define PECULIAR_486
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#include "fpu_asm.h"
#define Const(x) $##x
#else
@@ -68,7 +68,7 @@
#define FPU_Exception Const(0x80000000) /* Added to tag returns. */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include "fpu_system.h"
@@ -213,6 +213,6 @@ asmlinkage int FPU_round(FPU_REG *arg, unsigned int extent, int dummy,
#include "fpu_proto.h"
#endif
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _FPU_EMU_H_ */
diff --git a/arch/x86/math-emu/status_w.h b/arch/x86/math-emu/status_w.h
index b77bafe..f642957 100644
--- a/arch/x86/math-emu/status_w.h
+++ b/arch/x86/math-emu/status_w.h
@@ -13,7 +13,7 @@
#include "fpu_emu.h" /* for definition of PECULIAR_486 */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define Const__(x) $##x
#else
#define Const__(x) x
@@ -37,7 +37,7 @@
#define SW_Exc_Mask Const__(0x27f) /* Status word exception bit mask */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define COMP_A_gt_B 1
#define COMP_A_eq_B 2
@@ -63,6 +63,6 @@ static inline void setcc(int cc)
# define clear_C1()
#endif /* PECULIAR_486 */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _STATUS_H_ */
diff --git a/arch/x86/realmode/rm/realmode.h b/arch/x86/realmode/rm/realmode.h
index c76041a..867e55f 100644
--- a/arch/x86/realmode/rm/realmode.h
+++ b/arch/x86/realmode/rm/realmode.h
@@ -2,7 +2,7 @@
#ifndef ARCH_X86_REALMODE_RM_REALMODE_H
#define ARCH_X86_REALMODE_RM_REALMODE_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/*
* 16-bit ljmpw to the real_mode_seg
@@ -12,7 +12,7 @@
*/
#define LJMPW_RM(to) .byte 0xea ; .word (to), real_mode_seg
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* Signature at the end of the realmode region
diff --git a/arch/x86/realmode/rm/wakeup.h b/arch/x86/realmode/rm/wakeup.h
index 0e4fd08..3b6d8fa 100644
--- a/arch/x86/realmode/rm/wakeup.h
+++ b/arch/x86/realmode/rm/wakeup.h
@@ -7,7 +7,7 @@
#ifndef ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
#define ARCH_X86_KERNEL_ACPI_RM_WAKEUP_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
/* This must match data at wakeup.S */
diff --git a/tools/arch/x86/include/asm/asm.h b/tools/arch/x86/include/asm/asm.h
index 3ad3da9..dbe39b4 100644
--- a/tools/arch/x86/include/asm/asm.h
+++ b/tools/arch/x86/include/asm/asm.h
@@ -2,7 +2,7 @@
#ifndef _ASM_X86_ASM_H
#define _ASM_X86_ASM_H
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __ASM_FORM(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_RAW(x, ...) x,## __VA_ARGS__
# define __ASM_FORM_COMMA(x, ...) x,## __VA_ARGS__,
@@ -123,7 +123,7 @@
#ifdef __KERNEL__
/* Exception table entry */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
.pushsection "__ex_table","a" ; \
.balign 4 ; \
@@ -154,7 +154,7 @@
# define _ASM_NOKPROBE(entry)
# endif
-#else /* ! __ASSEMBLY__ */
+#else /* ! __ASSEMBLER__ */
# define _EXPAND_EXTABLE_HANDLE(x) #x
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
" .pushsection \"__ex_table\",\"a\"\n" \
@@ -186,7 +186,7 @@
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* __KERNEL__ */
diff --git a/tools/arch/x86/include/asm/nops.h b/tools/arch/x86/include/asm/nops.h
index 1c1b755..cd94221 100644
--- a/tools/arch/x86/include/asm/nops.h
+++ b/tools/arch/x86/include/asm/nops.h
@@ -82,7 +82,7 @@
#define ASM_NOP7 _ASM_BYTES(BYTES_NOP7)
#define ASM_NOP8 _ASM_BYTES(BYTES_NOP8)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern const unsigned char * const x86_nops[];
#endif
diff --git a/tools/arch/x86/include/asm/orc_types.h b/tools/arch/x86/include/asm/orc_types.h
index 46d7e06..e0125af 100644
--- a/tools/arch/x86/include/asm/orc_types.h
+++ b/tools/arch/x86/include/asm/orc_types.h
@@ -45,7 +45,7 @@
#define ORC_TYPE_REGS 3
#define ORC_TYPE_REGS_PARTIAL 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/byteorder.h>
/*
@@ -73,6 +73,6 @@ struct orc_entry {
#endif
} __packed;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ORC_TYPES_H */
diff --git a/tools/arch/x86/include/asm/pvclock-abi.h b/tools/arch/x86/include/asm/pvclock-abi.h
index 1436226..b9fece5 100644
--- a/tools/arch/x86/include/asm/pvclock-abi.h
+++ b/tools/arch/x86/include/asm/pvclock-abi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PVCLOCK_ABI_H
#define _ASM_X86_PVCLOCK_ABI_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* These structs MUST NOT be changed.
@@ -44,5 +44,5 @@ struct pvclock_wall_clock {
#define PVCLOCK_GUEST_STOPPED (1 << 1)
/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */
#define PVCLOCK_COUNTS_FROM_ZERO (1 << 2)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _ASM_X86_PVCLOCK_ABI_H */
^ permalink raw reply related [flat|nested] 94+ messages in thread
* [PATCH 38/41] xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (36 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 37/41] x86: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 7:10 ` [PATCH 39/41] xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
` (2 subsequent siblings)
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Chris Zankel,
Max Filippov
__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembly
code.
This is a completely mechanical patch (done with a simple "sed -i"
statement).
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/xtensa/include/uapi/asm/ptrace.h | 2 +-
arch/xtensa/include/uapi/asm/signal.h | 6 +++---
arch/xtensa/include/uapi/asm/types.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/xtensa/include/uapi/asm/ptrace.h b/arch/xtensa/include/uapi/asm/ptrace.h
index 9115e86ebc75f..6e89ea3014380 100644
--- a/arch/xtensa/include/uapi/asm/ptrace.h
+++ b/arch/xtensa/include/uapi/asm/ptrace.h
@@ -42,7 +42,7 @@
#define PTRACE_GETFDPIC_EXEC 0
#define PTRACE_GETFDPIC_INTERP 1
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct user_pt_regs {
__u32 pc;
diff --git a/arch/xtensa/include/uapi/asm/signal.h b/arch/xtensa/include/uapi/asm/signal.h
index b8c824dd4b746..8060f19144008 100644
--- a/arch/xtensa/include/uapi/asm/signal.h
+++ b/arch/xtensa/include/uapi/asm/signal.h
@@ -19,7 +19,7 @@
#define _NSIG_BPW 32
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -77,7 +77,7 @@ typedef struct {
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm-generic/signal-defs.h>
@@ -106,5 +106,5 @@ typedef struct sigaltstack {
__kernel_size_t ss_size;
} stack_t;
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _UAPI_XTENSA_SIGNAL_H */
diff --git a/arch/xtensa/include/uapi/asm/types.h b/arch/xtensa/include/uapi/asm/types.h
index 12db8ac38750f..2e9217a06ebf9 100644
--- a/arch/xtensa/include/uapi/asm/types.h
+++ b/arch/xtensa/include/uapi/asm/types.h
@@ -14,7 +14,7 @@
#include <asm-generic/int-ll64.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# define __XTENSA_UL(x) (x)
# define __XTENSA_UL_CONST(x) x
#else
@@ -23,7 +23,7 @@
# define __XTENSA_UL_CONST(x) ___XTENSA_UL_CONST(x)
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#endif
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 39/41] xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (37 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 38/41] xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 7:10 ` [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version Thomas Huth
2025-03-14 7:10 ` [PATCH 41/41] treewide: Stop defining __ASSEMBLY__ for assembler files Thomas Huth
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Chris Zankel,
Max Filippov
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: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/xtensa/include/asm/bootparam.h | 2 +-
arch/xtensa/include/asm/cmpxchg.h | 4 ++--
arch/xtensa/include/asm/coprocessor.h | 8 ++++----
arch/xtensa/include/asm/current.h | 2 +-
arch/xtensa/include/asm/ftrace.h | 8 ++++----
arch/xtensa/include/asm/initialize_mmu.h | 4 ++--
arch/xtensa/include/asm/jump_label.h | 4 ++--
arch/xtensa/include/asm/kasan.h | 2 +-
arch/xtensa/include/asm/kmem_layout.h | 2 +-
arch/xtensa/include/asm/page.h | 4 ++--
arch/xtensa/include/asm/pgtable.h | 8 ++++----
arch/xtensa/include/asm/processor.h | 4 ++--
arch/xtensa/include/asm/ptrace.h | 6 +++---
arch/xtensa/include/asm/signal.h | 4 ++--
arch/xtensa/include/asm/thread_info.h | 8 ++++----
arch/xtensa/include/asm/tlbflush.h | 4 ++--
16 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/arch/xtensa/include/asm/bootparam.h b/arch/xtensa/include/asm/bootparam.h
index 6333bd1eb9d2a..a459ffbaf7ab1 100644
--- a/arch/xtensa/include/asm/bootparam.h
+++ b/arch/xtensa/include/asm/bootparam.h
@@ -27,7 +27,7 @@
#define BP_TAG_FIRST 0x7B0B /* first tag with a version number */
#define BP_TAG_LAST 0x7E0B /* last tag */
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* All records are aligned to 4 bytes */
diff --git a/arch/xtensa/include/asm/cmpxchg.h b/arch/xtensa/include/asm/cmpxchg.h
index 95e33a913962d..b6db4838b175a 100644
--- a/arch/xtensa/include/asm/cmpxchg.h
+++ b/arch/xtensa/include/asm/cmpxchg.h
@@ -11,7 +11,7 @@
#ifndef _XTENSA_CMPXCHG_H
#define _XTENSA_CMPXCHG_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/bits.h>
#include <linux/stringify.h>
@@ -220,6 +220,6 @@ __arch_xchg(unsigned long x, volatile void * ptr, int size)
}
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _XTENSA_CMPXCHG_H */
diff --git a/arch/xtensa/include/asm/coprocessor.h b/arch/xtensa/include/asm/coprocessor.h
index 3b1a0d5d2169d..e0447bcc52c50 100644
--- a/arch/xtensa/include/asm/coprocessor.h
+++ b/arch/xtensa/include/asm/coprocessor.h
@@ -16,7 +16,7 @@
#include <asm/core.h>
#include <asm/types.h>
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
# include <variant/tie-asm.h>
.macro xchal_sa_start a b
@@ -69,7 +69,7 @@
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
/*
* XTENSA_HAVE_COPROCESSOR(x) returns 1 if coprocessor x is configured.
@@ -87,7 +87,7 @@
#define XTENSA_HAVE_IO_PORTS \
XCHAL_CP_PORT_MASK
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/*
* Additional registers.
@@ -151,5 +151,5 @@ void local_coprocessors_flush_release_all(void);
#endif /* XTENSA_HAVE_COPROCESSORS */
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _XTENSA_COPROCESSOR_H */
diff --git a/arch/xtensa/include/asm/current.h b/arch/xtensa/include/asm/current.h
index df275d5547884..7b483538f066c 100644
--- a/arch/xtensa/include/asm/current.h
+++ b/arch/xtensa/include/asm/current.h
@@ -13,7 +13,7 @@
#include <asm/thread_info.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/thread_info.h>
diff --git a/arch/xtensa/include/asm/ftrace.h b/arch/xtensa/include/asm/ftrace.h
index 0ea4f84cd5581..f676d209d1105 100644
--- a/arch/xtensa/include/asm/ftrace.h
+++ b/arch/xtensa/include/asm/ftrace.h
@@ -12,20 +12,20 @@
#include <asm/processor.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long return_address(unsigned level);
#define ftrace_return_address(n) return_address(n)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#ifdef CONFIG_FUNCTION_TRACER
#define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 3
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern void _mcount(void);
#define mcount _mcount
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* CONFIG_FUNCTION_TRACER */
#endif /* _XTENSA_FTRACE_H */
diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h
index 574795a20d6f6..101bcb87e15be 100644
--- a/arch/xtensa/include/asm/initialize_mmu.h
+++ b/arch/xtensa/include/asm/initialize_mmu.h
@@ -34,7 +34,7 @@
#define CA_WRITEBACK (0x4)
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define XTENSA_HWVERSION_RC_2009_0 230000
@@ -240,6 +240,6 @@
.endm
-#endif /*__ASSEMBLY__*/
+#endif /*__ASSEMBLER__*/
#endif /* _XTENSA_INITIALIZE_MMU_H */
diff --git a/arch/xtensa/include/asm/jump_label.h b/arch/xtensa/include/asm/jump_label.h
index 46c8596259d2d..38e3e2a9b0fb4 100644
--- a/arch/xtensa/include/asm/jump_label.h
+++ b/arch/xtensa/include/asm/jump_label.h
@@ -4,7 +4,7 @@
#ifndef _ASM_XTENSA_JUMP_LABEL_H
#define _ASM_XTENSA_JUMP_LABEL_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <linux/types.h>
@@ -61,5 +61,5 @@ struct jump_entry {
jump_label_t key;
};
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif
diff --git a/arch/xtensa/include/asm/kasan.h b/arch/xtensa/include/asm/kasan.h
index 8d2b4248466fd..0da91b64fab96 100644
--- a/arch/xtensa/include/asm/kasan.h
+++ b/arch/xtensa/include/asm/kasan.h
@@ -2,7 +2,7 @@
#ifndef __ASM_KASAN_H
#define __ASM_KASAN_H
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#ifdef CONFIG_KASAN
diff --git a/arch/xtensa/include/asm/kmem_layout.h b/arch/xtensa/include/asm/kmem_layout.h
index 6fc05cba61a27..6949724625a07 100644
--- a/arch/xtensa/include/asm/kmem_layout.h
+++ b/arch/xtensa/include/asm/kmem_layout.h
@@ -80,7 +80,7 @@
#if (!XCHAL_HAVE_PTP_MMU || XCHAL_HAVE_SPANNING_WAY) && defined(CONFIG_USE_OF)
#define XCHAL_KIO_PADDR xtensa_get_kio_paddr()
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
extern unsigned long xtensa_kio_paddr;
static inline unsigned long xtensa_get_kio_paddr(void)
diff --git a/arch/xtensa/include/asm/page.h b/arch/xtensa/include/asm/page.h
index 644413792bf35..20655174b1115 100644
--- a/arch/xtensa/include/asm/page.h
+++ b/arch/xtensa/include/asm/page.h
@@ -80,7 +80,7 @@
#endif
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
#define __pgprot(x) (x)
@@ -172,7 +172,7 @@ static inline unsigned long ___pa(unsigned long va)
#define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#include <asm-generic/memory_model.h>
#endif /* _XTENSA_PAGE_H */
diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h
index 1647a7cc3fbf6..46b634934f13f 100644
--- a/arch/xtensa/include/asm/pgtable.h
+++ b/arch/xtensa/include/asm/pgtable.h
@@ -203,7 +203,7 @@
* What follows is the closest we can get by reasonable means..
* See linux/mm/mmap.c for protection_map[] array that uses these definitions.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@@ -372,10 +372,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte)
return pte;
}
-#endif /* !defined (__ASSEMBLY__) */
+#endif /* !defined (__ASSEMBLER__) */
-#ifdef __ASSEMBLY__
+#ifdef __ASSEMBLER__
/* Assembly macro _PGD_INDEX is the same as C pgd_index(unsigned long),
* _PGD_OFFSET as C pgd_offset(struct mm_struct*, unsigned long),
@@ -414,7 +414,7 @@ void update_mmu_tlb_range(struct vm_area_struct *vma,
unsigned long address, pte_t *ptep, unsigned int nr);
#define update_mmu_tlb_range update_mmu_tlb_range
-#endif /* !defined (__ASSEMBLY__) */
+#endif /* !defined (__ASSEMBLER__) */
#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h
index 47b5df86ab5c5..60a2113563358 100644
--- a/arch/xtensa/include/asm/processor.h
+++ b/arch/xtensa/include/asm/processor.h
@@ -105,7 +105,7 @@
#error Unsupported xtensa ABI
#endif
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if defined(__XTENSA_WINDOWED_ABI__)
@@ -263,5 +263,5 @@ static inline unsigned long get_er(unsigned long addr)
#endif /* XCHAL_HAVE_EXTERN_REGS */
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _XTENSA_PROCESSOR_H */
diff --git a/arch/xtensa/include/asm/ptrace.h b/arch/xtensa/include/asm/ptrace.h
index 86c70117371bb..f0f5e7c224c9e 100644
--- a/arch/xtensa/include/asm/ptrace.h
+++ b/arch/xtensa/include/asm/ptrace.h
@@ -41,7 +41,7 @@
#define NO_SYSCALL (-1)
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <asm/coprocessor.h>
#include <asm/core.h>
@@ -109,11 +109,11 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
int do_syscall_trace_enter(struct pt_regs *regs);
void do_syscall_trace_leave(struct pt_regs *regs);
-#else /* __ASSEMBLY__ */
+#else /* __ASSEMBLER__ */
# include <asm/asm-offsets.h>
#define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE)
-#endif /* !__ASSEMBLY__ */
+#endif /* !__ASSEMBLER__ */
#endif /* _XTENSA_PTRACE_H */
diff --git a/arch/xtensa/include/asm/signal.h b/arch/xtensa/include/asm/signal.h
index de169b4eaeef5..d301e68573cc1 100644
--- a/arch/xtensa/include/asm/signal.h
+++ b/arch/xtensa/include/asm/signal.h
@@ -14,10 +14,10 @@
#include <uapi/asm/signal.h>
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define __ARCH_HAS_SA_RESTORER
#include <asm/sigcontext.h>
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _XTENSA_SIGNAL_H */
diff --git a/arch/xtensa/include/asm/thread_info.h b/arch/xtensa/include/asm/thread_info.h
index e0dffcc43b9e6..5b74dfc35ef95 100644
--- a/arch/xtensa/include/asm/thread_info.h
+++ b/arch/xtensa/include/asm/thread_info.h
@@ -16,7 +16,7 @@
#define CURRENT_SHIFT KERNEL_STACK_SHIFT
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
# include <asm/processor.h>
#endif
@@ -28,7 +28,7 @@
* must also be changed
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#if XTENSA_HAVE_COPROCESSORS
@@ -80,7 +80,7 @@ struct thread_info {
* macros/functions for gaining access to the thread information structure
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#define INIT_THREAD_INFO(tsk) \
{ \
@@ -99,7 +99,7 @@ static __always_inline struct thread_info *current_thread_info(void)
return ti;
}
-#else /* !__ASSEMBLY__ */
+#else /* !__ASSEMBLER__ */
/* how to get the thread information struct from ASM */
#define GET_THREAD_INFO(reg,sp) \
diff --git a/arch/xtensa/include/asm/tlbflush.h b/arch/xtensa/include/asm/tlbflush.h
index 573df8cea2006..3edaebeef4239 100644
--- a/arch/xtensa/include/asm/tlbflush.h
+++ b/arch/xtensa/include/asm/tlbflush.h
@@ -20,7 +20,7 @@
#define ITLB_HIT_BIT 3
#define DTLB_HIT_BIT 4
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
/* TLB flushing:
*
@@ -201,5 +201,5 @@ static inline unsigned long read_itlb_translation (int way)
return tmp;
}
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* _XTENSA_TLBFLUSH_H */
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (38 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 39/41] xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
2025-03-14 20:47 ` Rob Herring
2025-03-14 7:10 ` [PATCH 41/41] treewide: Stop defining __ASSEMBLY__ for assembler files Thomas Huth
40 siblings, 1 reply; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel
Cc: Arnd Bergmann, linux-arch, Thomas Huth, Rob Herring,
Saravana Kannan, devicetree
Update the header to this upstream version to change the
__ASSEMBLY__ macro into __ASSEMBLER__ :
https://web.git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=f4c53f4ebf78
Cc: Rob Herring <robh@kernel.org>
Cc: Saravana Kannan <saravanak@google.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
scripts/dtc/libfdt/fdt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/dtc/libfdt/fdt.h b/scripts/dtc/libfdt/fdt.h
index 0c91aa7f67b5b..a07abfcc71089 100644
--- a/scripts/dtc/libfdt/fdt.h
+++ b/scripts/dtc/libfdt/fdt.h
@@ -7,7 +7,7 @@
* Copyright 2012 Kim Phillips, Freescale Semiconductor.
*/
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
struct fdt_header {
fdt32_t magic; /* magic word FDT_MAGIC */
@@ -45,7 +45,7 @@ struct fdt_property {
char data[];
};
-#endif /* !__ASSEMBLY */
+#endif /* !__ASSEMBLER__ */
#define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */
#define FDT_TAGSIZE sizeof(fdt32_t)
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread* Re: [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version
2025-03-14 7:10 ` [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version Thomas Huth
@ 2025-03-14 20:47 ` Rob Herring
2025-03-17 5:53 ` Thomas Huth
0 siblings, 1 reply; 94+ messages in thread
From: Rob Herring @ 2025-03-14 20:47 UTC (permalink / raw)
To: Thomas Huth
Cc: linux-kernel, Arnd Bergmann, linux-arch, Saravana Kannan,
devicetree
On Fri, Mar 14, 2025 at 08:10:11AM +0100, Thomas Huth wrote:
> Update the header to this upstream version to change the
> __ASSEMBLY__ macro into __ASSEMBLER__ :
>
> https://web.git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=f4c53f4ebf78
>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Saravana Kannan <saravanak@google.com>
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> scripts/dtc/libfdt/fdt.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Are you wanting me to apply this or ack it? Normally we only change dtc
with the sync with upstream script.
Or maybe it doesn't matter? Do we use this header in any assembly in the
kernel? Offhand, I don't think so.
Rob
^ permalink raw reply [flat|nested] 94+ messages in thread
* Re: [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version
2025-03-14 20:47 ` Rob Herring
@ 2025-03-17 5:53 ` Thomas Huth
0 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-17 5:53 UTC (permalink / raw)
To: Rob Herring
Cc: linux-kernel, Arnd Bergmann, linux-arch, Saravana Kannan,
devicetree
On 14/03/2025 21.47, Rob Herring wrote:
> On Fri, Mar 14, 2025 at 08:10:11AM +0100, Thomas Huth wrote:
>> Update the header to this upstream version to change the
>> __ASSEMBLY__ macro into __ASSEMBLER__ :
>>
>> https://web.git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=f4c53f4ebf78
>>
>> Cc: Rob Herring <robh@kernel.org>
>> Cc: Saravana Kannan <saravanak@google.com>
>> Cc: devicetree@vger.kernel.org
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> scripts/dtc/libfdt/fdt.h | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Are you wanting me to apply this or ack it? Normally we only change dtc
> with the sync with upstream script.
As long as this series is still under discussion, I think an ack is sufficient.
Thanks,
Thomas
^ permalink raw reply [flat|nested] 94+ messages in thread
* [PATCH 41/41] treewide: Stop defining __ASSEMBLY__ for assembler files
2025-03-14 7:09 [PATCH 00/41] treewide: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files Thomas Huth
` (39 preceding siblings ...)
2025-03-14 7:10 ` [PATCH 40/41] scripts/dtc: Update fdt.h to the latest version Thomas Huth
@ 2025-03-14 7:10 ` Thomas Huth
40 siblings, 0 replies; 94+ messages in thread
From: Thomas Huth @ 2025-03-14 7:10 UTC (permalink / raw)
To: linux-kernel; +Cc: Arnd Bergmann, linux-arch, Thomas Huth
All spots have been changed to __ASSEMBLER__ (i.e. the macro that
gets defined by the compiler), so we don't have to manually define
__ASSEMBLY__ now anymore.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
Makefile | 2 +-
arch/arm64/kernel/vdso32/Makefile | 1 -
arch/loongarch/vdso/Makefile | 2 +-
arch/mips/boot/compressed/Makefile | 2 +-
arch/mips/vdso/Makefile | 2 +-
arch/powerpc/boot/Makefile | 2 +-
arch/powerpc/platforms/cell/spufs/Makefile | 2 +-
arch/s390/Makefile | 2 +-
arch/x86/boot/Makefile | 2 +-
arch/x86/boot/compressed/Makefile | 2 +-
arch/x86/realmode/rm/Makefile | 2 +-
arch/xtensa/kernel/Makefile | 2 +-
drivers/net/wan/Makefile | 2 +-
scripts/Makefile.build | 2 +-
scripts/gfp-translate | 2 +-
tools/testing/selftests/kvm/lib/riscv/handlers.S | 4 ----
tools/testing/selftests/vDSO/vgetrandom-chacha.S | 2 --
17 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
index 1d6a9ec8a2ace..b95210e975836 100644
--- a/Makefile
+++ b/Makefile
@@ -573,7 +573,7 @@ LINUXINCLUDE := \
-I$(objtree)/include \
$(USERINCLUDE)
-KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
+KBUILD_AFLAGS := -fno-PIE
KBUILD_CFLAGS :=
KBUILD_CFLAGS += -std=gnu11
diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile
index 25a2cb6317f35..a10a6a7eb9fed 100644
--- a/arch/arm64/kernel/vdso32/Makefile
+++ b/arch/arm64/kernel/vdso32/Makefile
@@ -93,7 +93,6 @@ VDSO_CFLAGS += -marm
endif
VDSO_AFLAGS := $(VDSO_CAFLAGS)
-VDSO_AFLAGS += -D__ASSEMBLY__
# From arm vDSO Makefile
VDSO_LDFLAGS += -Bsymbolic --no-undefined -soname=linux-vdso.so.1
diff --git a/arch/loongarch/vdso/Makefile b/arch/loongarch/vdso/Makefile
index fdde1bcd4e266..00ce65ef6150b 100644
--- a/arch/loongarch/vdso/Makefile
+++ b/arch/loongarch/vdso/Makefile
@@ -24,7 +24,7 @@ cflags-vdso := $(ccflags-vdso) \
$(call cc-option, -fno-asynchronous-unwind-tables) \
$(call cc-option, -fno-stack-protector)
aflags-vdso := $(ccflags-vdso) \
- -D__ASSEMBLY__ -Wa,-gdwarf-2
+ -Wa,-gdwarf-2
ifneq ($(c-gettimeofday-y),)
CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y)
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index e0b8ec9a95162..41ec115d4795b 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -30,7 +30,7 @@ endif
KBUILD_CFLAGS := $(KBUILD_CFLAGS) -D__KERNEL__ -D__DISABLE_EXPORTS \
-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull"
-KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
+KBUILD_AFLAGS := $(KBUILD_AFLAGS) \
-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
-DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS)
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index b289b2c1b2946..edff6c01506f1 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -32,7 +32,7 @@ cflags-vdso := $(ccflags-vdso) \
-fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \
$(call cc-option, -fno-asynchronous-unwind-tables)
aflags-vdso := $(ccflags-vdso) \
- -D__ASSEMBLY__ -Wa,-gdwarf-2
+ -Wa,-gdwarf-2
ifneq ($(c-gettimeofday-y),)
CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y)
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 1ff6ad4f6cd27..5cecf0ca22599 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -79,7 +79,7 @@ BOOTCFLAGS := $(BOOTTARGETFLAGS) \
$(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \
-fomit-frame-pointer -fno-builtin -fPIC
-BOOTAFLAGS := $(BOOTTARGETFLAGS) -D__ASSEMBLY__
+BOOTAFLAGS := $(BOOTTARGETFLAGS)
BOOTARFLAGS := -crD
diff --git a/arch/powerpc/platforms/cell/spufs/Makefile b/arch/powerpc/platforms/cell/spufs/Makefile
index 52e4c80ec8d03..c13928aea20c6 100644
--- a/arch/powerpc/platforms/cell/spufs/Makefile
+++ b/arch/powerpc/platforms/cell/spufs/Makefile
@@ -16,7 +16,7 @@ SPU_AS := $(SPU_CROSS)gcc
SPU_LD := $(SPU_CROSS)ld
SPU_OBJCOPY := $(SPU_CROSS)objcopy
SPU_CFLAGS := -O2 -Wall -I$(srctree)/include -D__KERNEL__
-SPU_AFLAGS := -c -D__ASSEMBLY__ -I$(srctree)/include -D__KERNEL__
+SPU_AFLAGS := -c -I$(srctree)/include -D__KERNEL__
SPU_LDFLAGS := -N -Ttext=0x0
$(obj)/switch.o: $(obj)/spu_save_dump.h $(obj)/spu_restore_dump.h
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 5fae311203c26..f024e39bfc13f 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -18,7 +18,7 @@ KBUILD_CFLAGS += -fPIC
LDFLAGS_vmlinux := -no-pie --emit-relocs --discard-none
extra_tools := relocs
aflags_dwarf := -Wa,-gdwarf-2
-KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__
+KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64
ifndef CONFIG_AS_IS_LLVM
KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))
endif
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 9cc0ff6e9067d..350d9c176c468 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -53,7 +53,7 @@ targets += cpustr.h
# ---------------------------------------------------------------------------
KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP
-KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+KBUILD_AFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
KBUILD_CFLAGS += $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 606c74f274593..7816033203207 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -50,7 +50,7 @@ KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h
# that the compiler finds it even with out-of-tree builds (make O=/some/path).
CFLAGS_sev.o += -I$(objtree)/arch/x86/lib/
-KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+KBUILD_AFLAGS := $(KBUILD_CFLAGS)
KBUILD_LDFLAGS := -m elf_$(UTS_MACHINE)
KBUILD_LDFLAGS += $(call ld-option,--no-ld-generated-unwind-info)
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index a0fb39abc5c86..20bbe1af05acd 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -65,5 +65,5 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
KBUILD_CFLAGS := $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
-I$(srctree)/arch/x86/boot
-KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+KBUILD_AFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS += -fno-asynchronous-unwind-tables
diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index f28b8e3d717ee..b0ba47cdce5e3 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -39,7 +39,7 @@ sed-y = -e ':a; s/\*(\([^)]*\)\.text\.unlikely/*(\1.literal.unlikely .{text}.unl
-e 's/\.{text}/.text/g'
quiet_cmd__cpp_lds_S = LDS $@
-cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa -D__ASSEMBLY__ \
+cmd__cpp_lds_S = $(CPP) $(cpp_flags) -P -C -Uxtensa \
-DLINKER_SCRIPT $< | sed $(sed-y) >$@
$(obj)/vmlinux.lds: $(src)/vmlinux.lds.S FORCE
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 00e9b7ee1e012..4233143534465 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -57,7 +57,7 @@ $(obj)/wanxlfw.bin: $(obj)/wanxlfw.o FORCE
$(call if_changed,m68kld_bin_o)
quiet_cmd_m68kas_o_S = M68KAS $@
- cmd_m68kas_o_S = $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $@ $<
+ cmd_m68kas_o_S = $(M68KCC) -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $@ $<
$(obj)/wanxlfw.o: $(src)/wanxlfw.S FORCE
$(call if_changed_dep,m68kas_o_S)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 993708d118745..89f8606a7dea0 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -346,7 +346,7 @@ targets += $(lib-y) $(always-y)
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@
cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -U$(ARCH) \
- -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
+ -DLINKER_SCRIPT -o $@ $<
$(obj)/%.lds: $(src)/%.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
diff --git a/scripts/gfp-translate b/scripts/gfp-translate
index 8385ae0d5af93..f6353795fdca3 100755
--- a/scripts/gfp-translate
+++ b/scripts/gfp-translate
@@ -73,7 +73,7 @@ echo Parsing: $GFPMASK
#include <stdio.h>
// Try to fool compiler.h into not including extra stuff
-#define __ASSEMBLY__ 1
+#define __ASSEMBLER__ 1
#include <generated/autoconf.h>
#include <linux/gfp_types.h>
diff --git a/tools/testing/selftests/kvm/lib/riscv/handlers.S b/tools/testing/selftests/kvm/lib/riscv/handlers.S
index aa0abd3f35bb0..f6d43979032df 100644
--- a/tools/testing/selftests/kvm/lib/riscv/handlers.S
+++ b/tools/testing/selftests/kvm/lib/riscv/handlers.S
@@ -3,10 +3,6 @@
* Copyright (c) 2023 Intel Corporation
*/
-#ifndef __ASSEMBLY__
-#define __ASSEMBLY__
-#endif
-
#include <asm/csr.h>
.macro save_context
diff --git a/tools/testing/selftests/vDSO/vgetrandom-chacha.S b/tools/testing/selftests/vDSO/vgetrandom-chacha.S
index d6e09af7c0a92..fffe3c700bba9 100644
--- a/tools/testing/selftests/vDSO/vgetrandom-chacha.S
+++ b/tools/testing/selftests/vDSO/vgetrandom-chacha.S
@@ -3,8 +3,6 @@
* Copyright (C) 2024 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
-#define __ASSEMBLY__
-
#if defined(__aarch64__)
#include "../../../../arch/arm64/kernel/vdso/vgetrandom-chacha.S"
#elif defined(__loongarch__)
--
2.48.1
^ permalink raw reply related [flat|nested] 94+ messages in thread