Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274599
b: refs/heads/master
c: 67b8499
h: refs/heads/master
i:
  274597: d3173e0
  274595: 560310c
  274591: 4ac8daa
v: v3
  • Loading branch information
Paul Gortmaker committed Oct 31, 2011
1 parent a66406f commit e419719
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec53cf23c0ddb0c29950b9a4ac46964c4c6c6c2f
refs/heads/master: 67b84999b1a8b1af5625b1eabe92146c5eb42932
10 changes: 0 additions & 10 deletions trunk/include/trace/define_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@
#undef CREATE_TRACE_POINTS

#include <linux/stringify.h>
/*
* module.h includes tracepoints, and because ftrace.h
* pulls in module.h:
* trace/ftrace.h -> linux/ftrace_event.h -> linux/perf_event.h ->
* linux/ftrace.h -> linux/module.h
* we must include module.h here before we play with any of
* the TRACE_EVENT() macros, otherwise the tracepoints included
* by module.h may break the build.
*/
#include <linux/module.h>

#undef TRACE_EVENT
#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
Expand Down

0 comments on commit e419719

Please sign in to comment.