It was introduced in 2.6.29, not 2.6.28.
Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
---
include/linux/compat-2.6.28.h | 24 ------------------------
include/linux/compat-2.6.29.h | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/include/linux/compat-2.6.28.h b/include/linux/compat-2.6.28.h
index 4cd623b..289ec06 100644
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -192,30 +192,6 @@ static inline void skb_queue_splice_tail(const struct sk_buff_head *list,
head->qlen += list->qlen;
}
}
-
-#ifndef DECLARE_TRACE
-
-#define TP_PROTO(args...) args
-#define TP_ARGS(args...) args
-
-#define DECLARE_TRACE(name, proto, args) \
- static inline void _do_trace_##name(struct tracepoint *tp, proto) \
- { } \
- static inline void trace_##name(proto) \
- { } \
- static inline int register_trace_##name(void (*probe)(proto)) \
- { \
- return -ENOSYS; \
- } \
- static inline int unregister_trace_##name(void (*probe)(proto)) \
- { \
- return -ENOSYS; \
- }
-
-#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
-#define EXPORT_TRACEPOINT_SYMBOL(name)
-
-
#endif
/* openSuse includes round_jiffies_up in it's kernel 2.6.27.
diff --git a/include/linux/compat-2.6.29.h b/include/linux/compat-2.6.29.h
index bd112d0..fa29806 100644
--- a/include/linux/compat-2.6.29.h
+++ b/include/linux/compat-2.6.29.h
@@ -277,6 +277,26 @@ static inline struct net *read_pnet(struct net * const *pnet)
#endif
+#define TP_PROTO(args...) args
+#define TP_ARGS(args...) args
+
+#define DECLARE_TRACE(name, proto, args) \
+ static inline void _do_trace_##name(struct tracepoint *tp, proto) \
+ { } \
+ static inline void trace_##name(proto) \
+ { } \
+ static inline int register_trace_##name(void (*probe)(proto)) \
+ { \
+ return -ENOSYS; \
+ } \
+ static inline int unregister_trace_##name(void (*probe)(proto)) \
+ { \
+ return -ENOSYS; \
+ }
+
+#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
+#define EXPORT_TRACEPOINT_SYMBOL(name)
+
extern int init_dummy_netdev(struct net_device *dev);
#else
--
1.7.2.30.gc37d7.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
