diff --git a/legacy/eina/src/include/eina_log.h b/legacy/eina/src/include/eina_log.h
index b18e91a2cc..5e492a8f04 100644
--- a/legacy/eina/src/include/eina_log.h
+++ b/legacy/eina/src/include/eina_log.h
@@ -214,8 +214,8 @@ EAPI void eina_log_domain_unregister(int domain);
 /*
  * Logging functions.
  */
-EAPI void eina_log_print(int domain, Eina_Log_Level level, const char *file, const char *function, int line, const char *fmt, ...) EINA_ARG_NONNULL(2, 3, 5);
-EAPI void eina_log_vprint(int domain, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, va_list args) EINA_ARG_NONNULL(2, 3, 5);
+EAPI void eina_log_print(int domain, Eina_Log_Level level, const char *file, const char *function, int line, const char *fmt, ...) EINA_ARG_NONNULL(3, 4, 6) EINA_PRINTF(6, 7) EINA_NOINSTRUMENT;
+EAPI void eina_log_vprint(int domain, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, va_list args) EINA_ARG_NONNULL(3, 4, 6) EINA_NOINSTRUMENT;
 
 
 /*
diff --git a/legacy/eina/src/include/eina_types.h b/legacy/eina/src/include/eina_types.h
index ecdf8ef9e6..9a2b2ab58a 100644
--- a/legacy/eina/src/include/eina_types.h
+++ b/legacy/eina/src/include/eina_types.h
@@ -86,6 +86,9 @@
 #ifdef EINA_CONST
 # undef EINA_CONST
 #endif
+#ifdef EINA_NOINSTRUMENT
+# undef EINA_NOINSTRUMENT
+#endif
 #ifdef EINA_UNLIKELY
 # undef EINA_UNLIKELY
 #endif
@@ -126,6 +129,7 @@
 #  define EINA_SCANF(fmt, arg)  __attribute__((format (scanf, fmt, arg)))
 #  define EINA_FORMAT(fmt) __attribute__((format_arg(fmt)))
 #  define EINA_CONST __attribute__((const))
+#  define EINA_NOINSTRUMENT __attribute__((no_instrument_function))
 #  define EINA_UNLIKELY(exp) __builtin_expect((exp), 0)
 #  define EINA_LIKELY(exp) __builtin_expect((exp), 1)
 # else
@@ -133,6 +137,7 @@
 #  define EINA_SCANF(fmt, arg)
 #  define EINA_FORMAT(fmt)
 #  define EINA_CONST
+#  define EINA_NOINSTRUMENT
 #  define EINA_UNLIKELY(exp) exp
 #  define EINA_LIKELY(exp) exp
 # endif
@@ -151,6 +156,7 @@
 # define EINA_SCANF(fmt, arg)
 # define EINA_FORMAT(fmt)
 # define EINA_CONST
+# define EINA_NOINSTRUMENT
 # define EINA_UNLIKELY(exp) exp
 # define EINA_LIKELY(exp) exp
 
@@ -173,6 +179,7 @@
 # else
 #  define EINA_CONST
 # endif
+# define EINA_NOINSTRUMENT
 # define EINA_UNLIKELY(exp) exp
 # define EINA_LIKELY(exp) exp
 
@@ -186,6 +193,7 @@
 # define EINA_SCANF(fmt, arg)
 # define EINA_FORMAT(fmt)
 # define EINA_CONST
+# define EINA_NOINSTRUMENT
 # define EINA_UNLIKELY(exp) exp
 # define EINA_LIKELY(exp) exp
 #endif /* ! __GNUC__ && ! _WIN32 && ! __SUNPRO_C */