diff --git a/[refs] b/[refs]
index 7e3192a396f2..94693737ba69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35dce1a99d010f3d738af4ce1b9b77302fdfe69c
+refs/heads/master: 6c347d43eea29221a8ebab9ff9cbe7a00cddac98
diff --git a/trunk/include/trace/define_trace.h b/trunk/include/trace/define_trace.h
index a89ed590597a..2a4b3bf74033 100644
--- a/trunk/include/trace/define_trace.h
+++ b/trunk/include/trace/define_trace.h
@@ -62,6 +62,7 @@
 #endif
 
 #undef TRACE_EVENT
+#undef TRACE_EVENT_FN
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */