Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / linux / compiler-gcc.h

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index dc3d6b7ce1ebafe159f4b65b7d1dc732caae4af9..22ab246feed34c104038d3f94e1401ea9a587f8f 100644 (file)
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -257,12 +257,25 @@
 #define KASAN_ABI_VERSION 3
 #endif
 
 #define KASAN_ABI_VERSION 3
 #endif
 

+#if GCC_VERSION >= 40902
+/*
+ * Tell the compiler that address safety instrumentation (KASAN)
+ * should not be applied to that function.
+ * Conflicts with inlining: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
+ */
+#define __no_sanitize_address __attribute__((no_sanitize_address))
+#endif
+

 #endif /* gcc version >= 40000 specific checks */
 
 #if !defined(__noclone)
 #define __noclone      /* not needed */
 #endif
 
 #endif /* gcc version >= 40000 specific checks */
 
 #if !defined(__noclone)
 #define __noclone      /* not needed */
 #endif
 

+#if !defined(__no_sanitize_address)
+#define __no_sanitize_address
+#endif
+

 /*
  * A trick to suppress uninitialized variable warning without generating any
  * code
 /*
  * A trick to suppress uninitialized variable warning without generating any
  * code