The __no_kasan_or_inline attribute is already defined in <linux/compiler.h>.
Drop it from the header here and do the replacement in its own commit.
Signed-off-by: Ahmad Fatoum <a.fat...@barebox.org>
---
include/linux/compiler_types.h | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 87ab117aca13..cd618e7dece1 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -378,26 +378,6 @@ struct ftrace_likely_data {
*/
#define noinline_for_stack noinline
-/*
- * Sanitizer helper attributes: Because using __always_inline and
- * __no_sanitize_* conflict, provide helper attributes that will either expand
- * to __no_sanitize_* in compilation units where instrumentation is enabled
- * (__SANITIZE_*__), or __always_inline in compilation units without
- * instrumentation (__SANITIZE_*__ undefined).
- */
-#ifdef __SANITIZE_ADDRESS__
-/*
- * We can't declare function 'inline' because __no_sanitize_address conflicts
- * with inlining. Attempt to inline it may cause a build failure.
- * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
- * '__maybe_unused' allows us to avoid defined-but-not-used warnings.
- */
-# define __no_kasan_or_inline __no_sanitize_address notrace __maybe_unused
-# define __no_sanitize_or_inline __no_kasan_or_inline
-#else
-# define __no_kasan_or_inline __always_inline
-#endif
-
#ifndef __no_sanitize_or_inline
#define __no_sanitize_or_inline __always_inline
#endif
--
2.39.5
