diff options
| author | Thomas Huth <thuth@redhat.com> | 2026-07-02 21:12:40 +0900 |
|---|---|---|
| committer | Masami Hiramatsu (Google) <mhiramat@kernel.org> | 2026-07-02 21:12:40 +0900 |
| commit | ffd9dada630d9149fe0572efea00e1d99981bc50 (patch) | |
| tree | f64150211260287a7bed2fca27567cdbf7efd822 | |
| parent | 823b37855829bc328d46102a56e4d0b2f7a3d0d1 (diff) | |
kprobes: Replace __ASSEMBLY__ with __ASSEMBLER__ in header file
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 now
on the __ASSEMBLER__ macro that is provided by the compilers.
Link: https://lore.kernel.org/all/20260619161434.88270-1-thuth@redhat.com/
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
| -rw-r--r-- | include/asm-generic/kprobes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/kprobes.h b/include/asm-generic/kprobes.h index 5290a2b2e15a..16f16963d503 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 */ |