git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
trace
/
define_trace.h
diff --git
a/include/trace/define_trace.h
b/include/trace/define_trace.h
index
5acfb1e
..
1dfab54
100644
(file)
--- a/
include/trace/define_trace.h
+++ b/
include/trace/define_trace.h
@@
-65,6
+65,10
@@
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+/* Make all open coded DECLARE_TRACE nops */
+#undef DECLARE_TRACE
+#define DECLARE_TRACE(name, proto, args)
+
#ifdef CONFIG_EVENT_TRACING
#include <trace/ftrace.h>
#endif
#ifdef CONFIG_EVENT_TRACING
#include <trace/ftrace.h>
#endif
@@
-75,6
+79,7
@@
#undef DEFINE_EVENT
#undef DEFINE_EVENT_PRINT
#undef TRACE_HEADER_MULTI_READ
#undef DEFINE_EVENT
#undef DEFINE_EVENT_PRINT
#undef TRACE_HEADER_MULTI_READ
+#undef DECLARE_TRACE
/* Only undef what we defined in this file */
#ifdef UNDEF_TRACE_INCLUDE_FILE
/* Only undef what we defined in this file */
#ifdef UNDEF_TRACE_INCLUDE_FILE