diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2013-04-02 13:51:40 +0200 |
---|---|---|
committer | Johannes Berg <johannes@sipsolutions.net> | 2013-04-02 13:51:40 +0200 |
commit | ecea0eee578740ed2e21e6c9a92aabf8ae94bb82 (patch) | |
tree | 6ad5249a39179af83330ac23e7c1ca481f873183 | |
parent | 76441bc4bf8ecda1595437988ff535a0a029fdf8 (diff) |
fix tracing backport
For kernels that didn't have correct tracing, it was broken.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
-rw-r--r-- | compat/include/linux/tracepoint.h | 9 | ||||
-rw-r--r-- | compat/include/trace/define_trace.h | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/compat/include/linux/tracepoint.h b/compat/include/linux/tracepoint.h index fc44692a..f67d8d39 100644 --- a/compat/include/linux/tracepoint.h +++ b/compat/include/linux/tracepoint.h @@ -13,12 +13,15 @@ */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) /* - * For 2.6.28+ include the original tracepoint.h but override - * the defines new code uses to disable tracing completely. + * For 2.6.28+ include the original tracepoint.h (for kernel header + * files that require it to work) but override the defines the code + * uses to disable tracing completely. */ #include_next <linux/tracepoint.h> #endif +#undef CREATE_TRACE_POINTS + #undef TRACE_EVENT #define TRACE_EVENT(name, proto, ...) \ static inline void trace_ ## name(proto) {} @@ -27,6 +30,8 @@ static inline void trace_ ## name(proto) {} #undef DEFINE_EVENT #define DEFINE_EVENT(evt_class, name, proto, ...) \ static inline void trace_ ## name(proto) {} +#undef EXPORT_TRACEPOINT_SYMBOL +#define EXPORT_TRACEPOINT_SYMBOL(...) #define TP_PROTO(args...) args #define TP_ARGS(args...) args diff --git a/compat/include/trace/define_trace.h b/compat/include/trace/define_trace.h index 7d03ccf7..0b407278 100644 --- a/compat/include/trace/define_trace.h +++ b/compat/include/trace/define_trace.h @@ -1,5 +1,5 @@ #include <linux/version.h> -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)) #include_next <trace/define_trace.h> -#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */ +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32)) */ |