Index: kernel/generic/include/trace.h
===================================================================
--- kernel/generic/include/trace.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/trace.h	(revision 2cc569a32f7a224374397a5bf949d29b469490ca)
@@ -36,5 +36,5 @@
 #define KERN_TRACE_H_
 
-#define NO_TRACE  __attribute__((no_instrument_function))
+#define _NO_TRACE  __attribute__((no_instrument_function))
 
 #endif