aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/um/include/asm/page.h
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2025-03-14 08:10:06 +0100
committerJohannes Berg <johannes.berg@intel.com>2025-07-22 17:12:45 +0200
commitfc9ed2f6589dc2c11f05883e5c323be5f39fd241 (patch)
tree68496b0e7f96958e0f5c23966e346494da7db7f0 /arch/um/include/asm/page.h
parentum: Stop tracking stub's PID via userspace_pid[] (diff)
downloadwireguard-linux-fc9ed2f6589dc2c11f05883e5c323be5f39fd241.tar.xz
wireguard-linux-fc9ed2f6589dc2c11f05883e5c323be5f39fd241.zip
um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode 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, 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> Link: https://patch.msgid.link/20250314071013.1575167-36-thuth@redhat.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/um/include/asm/page.h')
-rw-r--r--arch/um/include/asm/page.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
index 3d516f3ca9c7..6f54254aaf44 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