Module: xenomai-2.6
Branch: master
Commit: b172f0377d76c1195b85d8fdc639c749f45ee9bd
URL:    
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=b172f0377d76c1195b85d8fdc639c749f45ee9bd

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Sat Apr 27 23:43:56 2013 +0200

headers: no longer include asm/xenomai/syscall.h automatically

---

 include/nucleus/trace.h                 |    9 +++++----
 src/skins/common/assert_context.c       |    2 +-
 src/skins/common/trace.c                |    1 +
 src/testsuite/regression/native/leaks.c |    1 +
 src/testsuite/regression/posix/leaks.c  |    1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/nucleus/trace.h b/include/nucleus/trace.h
index fd0f02b..b81bd03 100644
--- a/include/nucleus/trace.h
+++ b/include/nucleus/trace.h
@@ -41,15 +41,16 @@
 #define xntrace_user_start()           xnarch_trace_user_start()
 #define xntrace_user_stop(v)           xnarch_trace_user_stop(v)
 #define xntrace_user_freeze(v, once)   xnarch_trace_user_freeze(v, once)
-#define xntrace_special(id, v) xnarch_trace_special(id, v)
+#define xntrace_special(id, v)         xnarch_trace_special(id, v)
 #define xntrace_special_u64(id, v)     xnarch_trace_special_u64(id, v)
-#define xntrace_pid(pid, prio) xnarch_trace_pid(pid, prio)
-#define xntrace_panic_freeze() xnarch_trace_panic_freeze()
+#define xntrace_pid(pid, prio)         xnarch_trace_pid(pid, prio)
+#define xntrace_panic_freeze()         xnarch_trace_panic_freeze()
 #define xntrace_panic_dump()           xnarch_trace_panic_dump()
 
 #else /* !(defined(__KERNEL__) || defined(__XENO_SIM__)) */
 
-#include <asm/xenomai/syscall.h>
+#include <asm-generic/xenomai/syscall.h>
+#include <asm/xenomai/tsc.h>
 
 int xntrace_max_begin(unsigned long v);
 
diff --git a/src/skins/common/assert_context.c 
b/src/skins/common/assert_context.c
index dea5160..605aefd 100644
--- a/src/skins/common/assert_context.c
+++ b/src/skins/common/assert_context.c
@@ -22,7 +22,7 @@
 #include "internal.h"
 
 #include <nucleus/thread.h>
-#include <asm-generic/syscall.h>
+#include <asm/xenomai/syscall.h>
 #include <asm-generic/current.h>
 
 static void assert_nrt_inner(void)
diff --git a/src/skins/common/trace.c b/src/skins/common/trace.c
index 5d3d66d..3338765 100644
--- a/src/skins/common/trace.c
+++ b/src/skins/common/trace.c
@@ -1,4 +1,5 @@
 #include <nucleus/trace.h>
+#include <asm/xenomai/syscall.h>
 
 int xntrace_max_begin(unsigned long v)
 {
diff --git a/src/testsuite/regression/native/leaks.c 
b/src/testsuite/regression/native/leaks.c
index e164267..4b492d5 100644
--- a/src/testsuite/regression/native/leaks.c
+++ b/src/testsuite/regression/native/leaks.c
@@ -16,6 +16,7 @@
 
 #include <nucleus/heap.h>
 #include <rtdk.h>
+#include <asm/xenomai/syscall.h>
 
 #include "check.h"
 
diff --git a/src/testsuite/regression/posix/leaks.c 
b/src/testsuite/regression/posix/leaks.c
index 59bfb84..ae8e26d 100644
--- a/src/testsuite/regression/posix/leaks.c
+++ b/src/testsuite/regression/posix/leaks.c
@@ -10,6 +10,7 @@
 #include <mqueue.h>
 
 #include <nucleus/heap.h>
+#include <asm/xenomai/syscall.h>
 
 #include "check.h"
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to