Module: xenomai-3
Branch: next
Commit: b1db961aacd984676b797952d11ce89913de9f57
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=b1db961aacd984676b797952d11ce89913de9f57
Author: Philippe Gerum <r...@xenomai.org>
Date: Tue Nov 3 13:11:25 2015 +0100
cobalt/kernel: fixup for v3.19+ (trace_seq)
---
kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 7 +++++++
kernel/cobalt/trace/cobalt-posix.h | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
index d0c3952..c742202 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
@@ -62,10 +62,17 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
#include <linux/netdevice.h>
+#include <linux/trace_seq.h>
#undef alloc_netdev
#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
+
+static inline unsigned char *
+trace_seq_buffer_ptr(struct trace_seq *s)
+{
+ return s->buffer + s->len;
+}
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
diff --git a/kernel/cobalt/trace/cobalt-posix.h
b/kernel/cobalt/trace/cobalt-posix.h
index 536108d..d87582f 100644
--- a/kernel/cobalt/trace/cobalt-posix.h
+++ b/kernel/cobalt/trace/cobalt-posix.h
@@ -92,7 +92,7 @@ DECLARE_EVENT_CLASS(syscall_exit,
#define cobalt_print_sched_params(__policy, __p_ex) \
({ \
- const char *__ret = p->buffer + p->len; \
+ const unsigned char *__ret = trace_seq_buffer_ptr(p); \
switch (__policy) { \
case SCHED_QUOTA: \
trace_seq_printf(p, "priority=%d, group=%d", \
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git
