Index: kernel/generic/include/context.h
===================================================================
--- kernel/generic/include/context.h	(revision da52547b3a8fc0b23125d3adbd5622075264ee53)
+++ kernel/generic/include/context.h	(revision 6da81e0c60d843f4695eea9a49c54c89e3d2535f)
@@ -37,4 +37,5 @@
 
 #include <typedefs.h>
+#include <trace.h>
 #include <arch/context.h>
 
@@ -89,6 +90,5 @@
  *
  */
-static inline void __attribute__((no_instrument_function))
-    context_restore(context_t *ctx)
+NO_TRACE static inline void context_restore(context_t *ctx)
 {
 	context_restore_arch(ctx);