Module: xenomai-head
Branch: master
Commit: f1025a322e82e7b5a6fc17afb5d1172dd1ed5128
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=f1025a322e82e7b5a6fc17afb5d1172dd1ed5128
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Sat Oct 9 12:26:56 2010 +0200
Re-enable marker support for latest LTTng
LTTng decided to out-source their tracing modules, thus CONFIG_LTT
disappeared from the kernel config. However, markers are only part of
the LTTng patch since 2.6.32, so use this dependency on recent kernels
instead.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
include/asm-generic/wrappers.h | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/asm-generic/wrappers.h b/include/asm-generic/wrappers.h
index 995ecf0..e5b8c89 100644
--- a/include/asm-generic/wrappers.h
+++ b/include/asm-generic/wrappers.h
@@ -480,7 +480,8 @@ static inline void *kzalloc(size_t size, int flags)
#define IRQF_SHARED SA_SHIRQ
#endif /* < 2.6.18 */
-#ifdef CONFIG_LTT
+#if defined(CONFIG_LTT) || \
+ (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31) && defined(CONFIG_MARKERS))
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
#define trace_mark(channel, ev, fmt, args...) \
@@ -494,10 +495,12 @@ static inline void *kzalloc(size_t size, int flags)
#endif /* < 2.6.27 */
#endif /* >= 2.6.24 */
-#else /* !CONFIG_LTT */
+#else /* !LTTng markers */
+
#undef trace_mark
#define trace_mark(channel, ev, fmt, args...) do { } while (0)
-#endif /* !CONFIG_LTT */
+
+#endif /* !LTTng markers */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
#define KMALLOC_MAX_SIZE 131072
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
