diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /include/trace/define_trace.h | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'include/trace/define_trace.h')
| -rw-r--r-- | include/trace/define_trace.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h index f7a7ae1e8f90..2a4b3bf74033 100644 --- a/include/trace/define_trace.h +++ b/include/trace/define_trace.h | |||
| @@ -26,6 +26,11 @@ | |||
| 26 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ | 26 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ |
| 27 | DEFINE_TRACE(name) | 27 | DEFINE_TRACE(name) |
| 28 | 28 | ||
| 29 | #undef TRACE_EVENT_FN | ||
| 30 | #define TRACE_EVENT_FN(name, proto, args, tstruct, \ | ||
| 31 | assign, print, reg, unreg) \ | ||
| 32 | DEFINE_TRACE_FN(name, reg, unreg) | ||
| 33 | |||
| 29 | #undef DECLARE_TRACE | 34 | #undef DECLARE_TRACE |
| 30 | #define DECLARE_TRACE(name, proto, args) \ | 35 | #define DECLARE_TRACE(name, proto, args) \ |
| 31 | DEFINE_TRACE(name) | 36 | DEFINE_TRACE(name) |
| @@ -56,6 +61,8 @@ | |||
| 56 | #include <trace/ftrace.h> | 61 | #include <trace/ftrace.h> |
| 57 | #endif | 62 | #endif |
| 58 | 63 | ||
| 64 | #undef TRACE_EVENT | ||
| 65 | #undef TRACE_EVENT_FN | ||
| 59 | #undef TRACE_HEADER_MULTI_READ | 66 | #undef TRACE_HEADER_MULTI_READ |
| 60 | 67 | ||
| 61 | /* Only undef what we defined in this file */ | 68 | /* Only undef what we defined in this file */ |