aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/setup.h
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2025-08-01 10:20:07 +0200
committerMadhavan Srinivasan <maddy@linux.ibm.com>2025-09-01 13:23:29 +0530
commit74db6cc331b0da5c48c62b7af68d747ec9af1984 (patch)
tree9d7bc390841a9f68c076a13680abb988d1905204 /arch/powerpc/include/asm/setup.h
parentpowerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers (diff)
downloadlinux-74db6cc331b0da5c48c62b7af68d747ec9af1984.tar.gz
linux-74db6cc331b0da5c48c62b7af68d747ec9af1984.zip
powerpc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
While the GCC and Clang compilers already define __ASSEMBLER__ automatically when compiling assembler code, __ASSEMBLY__ is a macro that only gets defined by the Makefiles in the kernel. This is bad since macros starting with two underscores are names that are reserved by the C language. It can also be very confusing for the developers when switching between userspace and kernelspace coding, or when dealing with uapi headers that rather should use __ASSEMBLER__ instead. So let's standardize now on the __ASSEMBLER__ macro that is provided by the compilers. 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. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/20250801082007.32904-3-thuth@redhat.com
Diffstat (limited to 'arch/powerpc/include/asm/setup.h')
-rw-r--r--arch/powerpc/include/asm/setup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index eed74c1fb832..50a92b24628d 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 */