On Fri, 19 Jun 2026 18:14:34 +0200 Thomas Huth <[email protected]> wrote:
> From: Thomas Huth <[email protected]> > > 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. > Oops, good catch! Let me pick it. Thanks! > Signed-off-by: Thomas Huth <[email protected]> > --- > Note: This patch has been split from an earlier bigger patch of > mine to ease reviewing. > > include/asm-generic/kprobes.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/asm-generic/kprobes.h b/include/asm-generic/kprobes.h > index 5290a2b2e15a0..16f16963d503d 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 */ > -- > 2.54.0 > -- Masami Hiramatsu (Google) <[email protected]>
