Index: kernel/generic/include/console/console.h
===================================================================
--- kernel/generic/include/console/console.h	(revision 4babe62eb29f1e035bd83e6062adb63603d1b9a8)
+++ kernel/generic/include/console/console.h	(revision cefb126edea34b0dd89c1d23a3945eba732448c8)
@@ -56,4 +56,6 @@
 extern outdev_t *stdout;
 
+extern void early_putchar(wchar_t);
+
 extern indev_t *stdin_wire(void);
 extern void stdout_wire(outdev_t *outdev);
Index: kernel/generic/include/context.h
===================================================================
--- kernel/generic/include/context.h	(revision 4babe62eb29f1e035bd83e6062adb63603d1b9a8)
+++ kernel/generic/include/context.h	(revision cefb126edea34b0dd89c1d23a3945eba732448c8)
@@ -87,6 +87,8 @@
  *
  * @param ctx Context structure.
+ *
  */
-static inline void context_restore(context_t *ctx)
+static inline void __attribute__((no_instrument_function))
+    context_restore(context_t *ctx)
 {
 	context_restore_arch(ctx);
Index: kernel/generic/include/debug.h
===================================================================
--- kernel/generic/include/debug.h	(revision 4babe62eb29f1e035bd83e6062adb63603d1b9a8)
+++ kernel/generic/include/debug.h	(revision cefb126edea34b0dd89c1d23a3945eba732448c8)
@@ -98,7 +98,4 @@
 	} while (0)
 
-extern void __cyg_profile_func_enter(void *, void *);
-extern void __cyg_profile_func_exit(void *, void *);
-
 #else /* CONFIG_LOG */
 
@@ -107,4 +104,11 @@
 #endif /* CONFIG_LOG */
 
+#ifdef CONFIG_TRACE
+
+extern void __cyg_profile_func_enter(void *, void *);
+extern void __cyg_profile_func_exit(void *, void *);
+
+#endif /* CONFIG_TRACE */
+
 #endif
 
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 4babe62eb29f1e035bd83e6062adb63603d1b9a8)
+++ kernel/generic/include/macros.h	(revision cefb126edea34b0dd89c1d23a3945eba732448c8)
@@ -47,5 +47,6 @@
  * @param sz2 Size of the second interval.
  */
-static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
+static inline int __attribute__((no_instrument_function))
+    overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
 {
 	uintptr_t e1 = s1 + sz1;