fix tracing backport

For kernels that didn't have correct tracing, it was broken.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

diff --git a/compat/include/linux/tracepoint.h b/compat/include/linux/tracepoint.h
index fc44692a1d68eabcd40d6443cfbf5f737c5c296f..f67d8d396fe43cb2ec0fe865393b0a095bd07d26 100644 (file)
--- 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 7d03ccf770e5f9c4dcfaba62c31f480bfdf3921a..0b4072786d49f15288917e730dced66245533cac 100644 (file)
--- 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)) */