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

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Tue Feb  2 01:42:31 2010 +0100

skins: move features check to asm/bits/bind.h

Features check usually involves inclusion of high-level glibc headers
such as stdio.h, so we avoid doing it in low-level headers, and move it
to asm/bits/bind.h which will be only used in bind.c.

---

 include/asm-arm/bits/Makefile.am      |    2 +-
 include/asm-arm/bits/Makefile.in      |    2 +-
 include/asm-arm/bits/bind.h           |  111 +++++++++++++++++++++++++++++++++
 include/asm-arm/syscall.h             |  104 +------------------------------
 include/asm-blackfin/bits/Makefile.am |    2 +-
 include/asm-blackfin/bits/Makefile.in |    2 +-
 include/asm-blackfin/bits/bind.h      |    6 ++
 include/asm-nios2/bits/Makefile.am    |    2 +-
 include/asm-nios2/bits/Makefile.in    |    2 +-
 include/asm-nios2/bits/bind.h         |    6 ++
 include/asm-powerpc/bits/Makefile.am  |    2 +-
 include/asm-powerpc/bits/Makefile.in  |    2 +-
 include/asm-powerpc/bits/bind.h       |    6 ++
 include/asm-x86/bits/Makefile.am      |    1 +
 include/asm-x86/bits/Makefile.in      |    1 +
 include/asm-x86/bits/bind.h           |   37 +++++++++++
 include/asm-x86/features_32.h         |   30 ---------
 src/skins/common/bind.c               |    2 +-
 src/skins/native/init.c               |    2 +-
 src/skins/posix/init.c                |    2 +-
 src/skins/psos+/init.c                |    2 +-
 src/skins/rtai/init.c                 |    2 +-
 src/skins/rtdm/init.c                 |    2 +-
 src/skins/uitron/init.c               |    2 +-
 src/skins/uitron/task.c               |    1 -
 src/skins/vrtx/init.c                 |    2 +-
 src/skins/vxworks/init.c              |    2 +-
 src/testsuite/sigtest/sigtest.c       |    2 +-
 28 files changed, 187 insertions(+), 152 deletions(-)

diff --git a/include/asm-arm/bits/Makefile.am b/include/asm-arm/bits/Makefile.am
index f8dc57a..5671a15 100644
--- a/include/asm-arm/bits/Makefile.am
+++ b/include/asm-arm/bits/Makefile.am
@@ -1,3 +1,3 @@
 includesubdir = $(includedir)/asm-arm/bits
 
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
diff --git a/include/asm-arm/bits/Makefile.in b/include/asm-arm/bits/Makefile.in
index 7b717c2..8ffd20f 100644
--- a/include/asm-arm/bits/Makefile.in
+++ b/include/asm-arm/bits/Makefile.in
@@ -224,7 +224,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 includesubdir = $(includedir)/asm-arm/bits
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
 all: all-am
 
 .SUFFIXES:
diff --git a/include/asm-arm/bits/bind.h b/include/asm-arm/bits/bind.h
new file mode 100644
index 0000000..46e4890
--- /dev/null
+++ b/include/asm-arm/bits/bind.h
@@ -0,0 +1,111 @@
+#ifndef _XENO_ASM_ARM_BIND_H
+#define _XENO_ASM_ARM_BIND_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <limits.h>
+
+#include <asm-generic/xenomai/bits/bind.h>
+#include <asm/xenomai/syscall.h>
+
+__attribute__((weak)) struct __xn_tscinfo __xn_tscinfo = {
+  type: -1
+};
+
+static inline void xeno_arm_features_check(void)
+{
+#ifdef XNARCH_ARM_TSC_TYPE
+       unsigned page_size;
+       int err, fd;
+       void *addr;
+
+       if (__xn_tscinfo.type != -1)
+               return;
+
+       err = XENOMAI_SYSCALL2(__xn_sys_arch,
+                              XENOMAI_SYSARCH_TSCINFO, &__xn_tscinfo);
+       if (err) {
+         error:
+               fprintf(stderr, "Xenomai: Your board/configuration does not"
+                       " allow tsc emulation in user-space: %d\n", err);
+               exit(EXIT_FAILURE);
+       }
+
+       fd = open("/dev/mem", O_RDONLY | O_SYNC);
+       if (fd == -1) {
+               perror("Xenomai init: open(/dev/mem)");
+               exit(EXIT_FAILURE);
+       }
+
+       page_size = sysconf(_SC_PAGESIZE);
+
+       switch(__xn_tscinfo.type) {
+#if XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING                   \
+       || XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_COUNTDOWN   \
+       || XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_FAST_WRAP
+       case __XN_TSC_TYPE_FREERUNNING:
+       case __XN_TSC_TYPE_FREERUNNING_COUNTDOWN: {
+               unsigned long phys_addr;
+
+               phys_addr = (unsigned long) __xn_tscinfo.u.fr.counter;
+               addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED,
+                           fd, phys_addr & ~(page_size - 1));
+               if (addr == MAP_FAILED) {
+                       perror("Xenomai init: mmap(/dev/mem)");
+                       exit(EXIT_FAILURE);
+               }
+
+               __xn_tscinfo.u.fr.counter = 
+                       ((volatile unsigned *)
+                        ((char *) addr + (phys_addr & (page_size - 1))));
+#if XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_FAST_WRAP
+               if (__xn_tscinfo.u.fr.mask >= ((1 << 28) - 1)) {
+                       fprintf(stderr, "Hardware tsc is not a fast wrapping"
+                               " one, select the correct platform, or fix\n"
+                               "configure.in\n");
+                       exit(EXIT_FAILURE);
+               }
+#endif /* __XN_TSC_TYPE_FREERUNNING_FAST_WRAP */
+               break;
+       }
+#elif XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_DECREMENTER
+       case __XN_TSC_TYPE_DECREMENTER: {
+               unsigned long phys_addr;
+
+               phys_addr = (unsigned long) __xn_tscinfo.u.dec.counter;
+               addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED,
+                           fd, phys_addr & ~(page_size - 1));
+               if (addr == MAP_FAILED) {
+                       perror("Xenomai init: mmap(/dev/mem)");
+                       exit(EXIT_FAILURE);
+               }
+
+               __xn_tscinfo.u.dec.counter = 
+                       ((volatile unsigned *)
+                        ((char *) addr + (phys_addr & (page_size - 1))));
+               break;
+       }
+#endif /* XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_DECREMENTER */
+       case __XN_TSC_TYPE_NONE:
+               goto error;
+               
+       default:
+               fprintf(stderr,
+                       "Xenomai: kernel/user tsc emulation mismatch.\n");
+               exit(EXIT_FAILURE);
+       }
+
+       if (close(fd)) {
+               perror("Xenomai init: close(/dev/mem)");
+               exit(EXIT_FAILURE);
+       }
+#endif /* XNARCH_ARM_TSC_TYPE */
+}
+#define xeno_arch_features_check() xeno_arm_features_check()
+
+#endif /* _XENO_ASM_ARM_BIND_H */
diff --git a/include/asm-arm/syscall.h b/include/asm-arm/syscall.h
index 0b51492..fb512b4 100644
--- a/include/asm-arm/syscall.h
+++ b/include/asm-arm/syscall.h
@@ -270,18 +270,7 @@ struct __xn_tscinfo {
 #define __XN_TSC_TYPE_FREERUNNING_COUNTDOWN 4
 
 #ifndef __KERNEL__
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <limits.h>
-
-__attribute__((weak)) struct __xn_tscinfo __xn_tscinfo = {
-  type: -1
-};
+extern struct __xn_tscinfo __xn_tscinfo;
 
 #ifdef XNARCH_ARM_TSC_TYPE
 static inline unsigned long long __xn_rdtsc(void)
@@ -360,97 +349,6 @@ static inline unsigned long long __xn_rdtsc(void)
 }
 #endif /* XNARCH_ARM_TSC_TYPE */
 
-static inline void xeno_arm_features_check(void)
-{
-#ifdef XNARCH_ARM_TSC_TYPE
-       unsigned page_size;
-       int err, fd;
-       void *addr;
-
-       if (__xn_tscinfo.type != -1)
-               return;
-
-       err = XENOMAI_SYSCALL2(__xn_sys_arch,
-                              XENOMAI_SYSARCH_TSCINFO, &__xn_tscinfo);
-       if (err) {
-         error:
-               fprintf(stderr, "Xenomai: Your board/configuration does not"
-                       " allow tsc emulation in user-space: %d\n", err);
-               exit(EXIT_FAILURE);
-       }
-
-       fd = open("/dev/mem", O_RDONLY | O_SYNC);
-       if (fd == -1) {
-               perror("Xenomai init: open(/dev/mem)");
-               exit(EXIT_FAILURE);
-       }
-
-       page_size = sysconf(_SC_PAGESIZE);
-
-       switch(__xn_tscinfo.type) {
-#if XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING                   \
-       || XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_COUNTDOWN   \
-       || XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_FAST_WRAP
-       case __XN_TSC_TYPE_FREERUNNING:
-       case __XN_TSC_TYPE_FREERUNNING_COUNTDOWN: {
-               unsigned long phys_addr;
-
-               phys_addr = (unsigned long) __xn_tscinfo.u.fr.counter;
-               addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED,
-                           fd, phys_addr & ~(page_size - 1));
-               if (addr == MAP_FAILED) {
-                       perror("Xenomai init: mmap(/dev/mem)");
-                       exit(EXIT_FAILURE);
-               }
-
-               __xn_tscinfo.u.fr.counter = 
-                       ((volatile unsigned *)
-                        ((char *) addr + (phys_addr & (page_size - 1))));
-#if XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_FREERUNNING_FAST_WRAP
-               if (__xn_tscinfo.u.fr.mask >= ((1 << 28) - 1)) {
-                       fprintf(stderr, "Hardware tsc is not a fast wrapping"
-                               " one, select the correct platform, or fix\n"
-                               "configure.in\n");
-                       exit(EXIT_FAILURE);
-               }
-#endif /* __XN_TSC_TYPE_FREERUNNING_FAST_WRAP */
-               break;
-       }
-#elif XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_DECREMENTER
-       case __XN_TSC_TYPE_DECREMENTER: {
-               unsigned long phys_addr;
-
-               phys_addr = (unsigned long) __xn_tscinfo.u.dec.counter;
-               addr = mmap(NULL, page_size, PROT_READ, MAP_SHARED,
-                           fd, phys_addr & ~(page_size - 1));
-               if (addr == MAP_FAILED) {
-                       perror("Xenomai init: mmap(/dev/mem)");
-                       exit(EXIT_FAILURE);
-               }
-
-               __xn_tscinfo.u.dec.counter = 
-                       ((volatile unsigned *)
-                        ((char *) addr + (phys_addr & (page_size - 1))));
-               break;
-       }
-#endif /* XNARCH_ARM_TSC_TYPE == __XN_TSC_TYPE_DECREMENTER */
-       case __XN_TSC_TYPE_NONE:
-               goto error;
-               
-       default:
-               fprintf(stderr,
-                       "Xenomai: kernel/user tsc emulation mismatch.\n");
-               exit(EXIT_FAILURE);
-       }
-
-       if (close(fd)) {
-               perror("Xenomai init: close(/dev/mem)");
-               exit(EXIT_FAILURE);
-       }
-#endif /* XNARCH_ARM_TSC_TYPE */
-}
-#define xeno_arch_features_check() xeno_arm_features_check()
-
 #endif /* !__KERNEL__ */
 
 #endif /* !_XENO_ASM_ARM_SYSCALL_H */
diff --git a/include/asm-blackfin/bits/Makefile.am 
b/include/asm-blackfin/bits/Makefile.am
index d7fcd72..fb22c45 100644
--- a/include/asm-blackfin/bits/Makefile.am
+++ b/include/asm-blackfin/bits/Makefile.am
@@ -1,3 +1,3 @@
 includesubdir = $(includedir)/asm-blackfin/bits
 
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
diff --git a/include/asm-blackfin/bits/Makefile.in 
b/include/asm-blackfin/bits/Makefile.in
index 784c424..206a847 100644
--- a/include/asm-blackfin/bits/Makefile.in
+++ b/include/asm-blackfin/bits/Makefile.in
@@ -224,7 +224,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 includesubdir = $(includedir)/asm-blackfin/bits
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
 all: all-am
 
 .SUFFIXES:
diff --git a/include/asm-blackfin/bits/bind.h b/include/asm-blackfin/bits/bind.h
new file mode 100644
index 0000000..5a2603e
--- /dev/null
+++ b/include/asm-blackfin/bits/bind.h
@@ -0,0 +1,6 @@
+#ifndef _XENO_ASM_BLACKFIN_BIND_H
+#define _XENO_ASM_BLACKFIN_BIND_H
+
+#include <asm-generic/xenomai/bits/bind.h>
+
+#endif /* _XENO_ASM_BLACKFIN_BIND_H */
diff --git a/include/asm-nios2/bits/Makefile.am 
b/include/asm-nios2/bits/Makefile.am
index 7e13d53..40b651a 100644
--- a/include/asm-nios2/bits/Makefile.am
+++ b/include/asm-nios2/bits/Makefile.am
@@ -1,3 +1,3 @@
 includesubdir = $(includedir)/asm-nios2/bits
 
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
diff --git a/include/asm-nios2/bits/Makefile.in 
b/include/asm-nios2/bits/Makefile.in
index 06a26f1..cdd7235 100644
--- a/include/asm-nios2/bits/Makefile.in
+++ b/include/asm-nios2/bits/Makefile.in
@@ -224,7 +224,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 includesubdir = $(includedir)/asm-nios2/bits
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
 all: all-am
 
 .SUFFIXES:
diff --git a/include/asm-nios2/bits/bind.h b/include/asm-nios2/bits/bind.h
new file mode 100644
index 0000000..8bba791
--- /dev/null
+++ b/include/asm-nios2/bits/bind.h
@@ -0,0 +1,6 @@
+#ifndef _XENO_ASM_NIOS2_BIND_H
+#define _XENO_ASM_NIOS2_BIND_H
+
+#include <asm-generic/xenomai/bits/bind.h>
+
+#endif /* _XENO_ASM_NIOS2_BIND_H */
diff --git a/include/asm-powerpc/bits/Makefile.am 
b/include/asm-powerpc/bits/Makefile.am
index a01a664..5cbcd72 100644
--- a/include/asm-powerpc/bits/Makefile.am
+++ b/include/asm-powerpc/bits/Makefile.am
@@ -1,3 +1,3 @@
 includesubdir = $(includedir)/asm-powerpc/bits
 
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
diff --git a/include/asm-powerpc/bits/Makefile.in 
b/include/asm-powerpc/bits/Makefile.in
index 1d5ab66..041d499 100644
--- a/include/asm-powerpc/bits/Makefile.in
+++ b/include/asm-powerpc/bits/Makefile.in
@@ -224,7 +224,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 includesubdir = $(includedir)/asm-powerpc/bits
-includesub_HEADERS = pod.h intr.h heap.h thread.h shadow.h timer.h init.h 
sched.h
+includesub_HEADERS = bind.h pod.h intr.h heap.h thread.h shadow.h timer.h 
init.h sched.h
 all: all-am
 
 .SUFFIXES:
diff --git a/include/asm-powerpc/bits/bind.h b/include/asm-powerpc/bits/bind.h
new file mode 100644
index 0000000..8d5da4b
--- /dev/null
+++ b/include/asm-powerpc/bits/bind.h
@@ -0,0 +1,6 @@
+#ifndef _XENO_ASM_POWERPC_BIND_H
+#define _XENO_ASM_POWERPC_BIND_H
+
+#include <asm-generic/xenomai/bits/bind.h>
+
+#endif /* _XENO_ASM_POWERPC_BIND_H */
diff --git a/include/asm-x86/bits/Makefile.am b/include/asm-x86/bits/Makefile.am
index 46ced01..695a44d 100644
--- a/include/asm-x86/bits/Makefile.am
+++ b/include/asm-x86/bits/Makefile.am
@@ -1,6 +1,7 @@
 includesubdir = $(includedir)/asm-x86/bits
 
 includesub_HEADERS =   \
+       bind.h          \
        heap.h          \
        init_32.h       \
        init_64.h       \
diff --git a/include/asm-x86/bits/Makefile.in b/include/asm-x86/bits/Makefile.in
index da28b4e..6245fd9 100644
--- a/include/asm-x86/bits/Makefile.in
+++ b/include/asm-x86/bits/Makefile.in
@@ -225,6 +225,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 includesubdir = $(includedir)/asm-x86/bits
 includesub_HEADERS = \
+       bind.h          \
        heap.h          \
        init_32.h       \
        init_64.h       \
diff --git a/include/asm-x86/bits/bind.h b/include/asm-x86/bits/bind.h
new file mode 100644
index 0000000..aba0b52
--- /dev/null
+++ b/include/asm-x86/bits/bind.h
@@ -0,0 +1,37 @@
+#ifndef _XENO_ASM_X86_BIND_H
+#define _XENO_ASM_X86_BIND_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <asm-generic/xenomai/bits/bind.h>
+#include <asm/xenomai/features.h>
+
+#ifdef __i386__
+static inline void xeno_x86_features_check(void)
+{
+#ifdef CONFIG_XENO_X86_SEP
+       size_t n = confstr(_CS_GNU_LIBPTHREAD_VERSION, NULL, 0);
+       if (n > 0) {
+               char buf[n];
+      
+               confstr (_CS_GNU_LIBPTHREAD_VERSION, buf, n);
+
+               if (strstr (buf, "NPTL"))
+                       return;
+       }
+
+       fprintf(stderr,
+"Xenomai: --enable-x86-sep needs NPTL and Linux 2.6.x or higher,\n"
+"which does not match your configuration. Please upgrade, or\n"
+"rebuild the user-space support passing --disable-x86-sep.\n");
+       exit(1);
+#endif /* CONFIG_XENO_X86_SEP */
+}
+#define xeno_arch_features_check() xeno_x86_features_check()
+
+#endif /* __i386__ */
+
+#endif /* _XENO_ASM_X86_BIND_H */
diff --git a/include/asm-x86/features_32.h b/include/asm-x86/features_32.h
index ab22d0c..9ac0ea3 100644
--- a/include/asm-x86/features_32.h
+++ b/include/asm-x86/features_32.h
@@ -79,36 +79,6 @@ static inline const char *get_feature_label (unsigned 
feature)
     }
 }
 
-#ifndef __KERNEL__
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static inline void xeno_x86_features_check(void)
-{
-#ifdef CONFIG_XENO_X86_SEP
-  size_t n = confstr(_CS_GNU_LIBPTHREAD_VERSION, NULL, 0);
-  if (n > 0)
-      {
-      char buf[n];
-      
-      confstr (_CS_GNU_LIBPTHREAD_VERSION, buf, n);
-
-      if (strstr (buf, "NPTL"))
-          return;
-      }
-
-  fprintf(stderr,
-         "Xenomai: --enable-x86-sep needs NPTL and Linux 2.6.x or higher,\n"
-         "which does not match your configuration. Please upgrade, or\n"
-          "rebuild the user-space support passing --disable-x86-sep.\n");
-  exit(1);
-#endif /* CONFIG_XENO_X86_SEP */
-}
-#define xeno_arch_features_check() xeno_x86_features_check()
-#endif /* __KERNEL__ */
-
 #define XNARCH_HAVE_LLMULSHFT    1
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
diff --git a/src/skins/common/bind.c b/src/skins/common/bind.c
index 830eefe..4f0c43c 100644
--- a/src/skins/common/bind.c
+++ b/src/skins/common/bind.c
@@ -5,9 +5,9 @@
 #include <errno.h>
 
 #include <asm/xenomai/syscall.h>
-#include <asm-generic/xenomai/bits/bind.h>
 #include <asm-generic/xenomai/bits/current.h>
 #include <asm-generic/xenomai/stack.h>
+#include <asm/xenomai/bits/bind.h>
 #include "sem_heap.h"
 
 static pthread_t xeno_main_tid;
diff --git a/src/skins/native/init.c b/src/skins/native/init.c
index 197f3ce..76e43cd 100644
--- a/src/skins/native/init.c
+++ b/src/skins/native/init.c
@@ -24,8 +24,8 @@
 #include <pthread.h>
 #include <native/syscall.h>
 #include <native/task.h>
-#include <asm-generic/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
+#include <asm/xenomai/bits/bind.h>
 
 int __native_muxid = -1;
 void native_timer_init(int);
diff --git a/src/skins/posix/init.c b/src/skins/posix/init.c
index 6028dd9..f27adb4 100644
--- a/src/skins/posix/init.c
+++ b/src/skins/posix/init.c
@@ -34,7 +34,7 @@
    be the __real variants */
 #define XENO_WRAPPED_OPEN
 
-#include <asm-generic/bits/bind.h>
+#include <asm/xenomai/bits/bind.h>
 
 int __pse51_muxid = -1;
 int __rtdm_muxid = -1;
diff --git a/src/skins/psos+/init.c b/src/skins/psos+/init.c
index 42a0e1d..7263925 100644
--- a/src/skins/psos+/init.c
+++ b/src/skins/psos+/init.c
@@ -20,8 +20,8 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <psos+/psos.h>
-#include <asm-generic/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
+#include <asm/xenomai/bits/bind.h>
 
 int __psos_muxid = -1;
 
diff --git a/src/skins/rtai/init.c b/src/skins/rtai/init.c
index 0939ecf..a050a95 100644
--- a/src/skins/rtai/init.c
+++ b/src/skins/rtai/init.c
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rtai/syscall.h>
-#include <asm-generic/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
+#include <asm/xenomai/bits/bind.h>
 
 int __rtai_muxid = -1;
 
diff --git a/src/skins/rtdm/init.c b/src/skins/rtdm/init.c
index f079550..c28391c 100644
--- a/src/skins/rtdm/init.c
+++ b/src/skins/rtdm/init.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rtdm/syscall.h>
-#include <asm-generic/bits/bind.h>
+#include <asm/xenomai/bits/bind.h>
 
 int __rtdm_muxid = -1;
 
diff --git a/src/skins/uitron/init.c b/src/skins/uitron/init.c
index 7dcdcef..2ab11f3 100644
--- a/src/skins/uitron/init.c
+++ b/src/skins/uitron/init.c
@@ -20,8 +20,8 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <uitron/uitron.h>
-#include <asm-generic/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
+#include <asm/xenomai/bits/bind.h>
 
 int __uitron_muxid = -1;
 
diff --git a/src/skins/uitron/task.c b/src/skins/uitron/task.c
index 8e184dc..3beff89 100644
--- a/src/skins/uitron/task.c
+++ b/src/skins/uitron/task.c
@@ -28,7 +28,6 @@
 #include <asm-generic/bits/sigshadow.h>
 #include <asm-generic/bits/current.h>
 #include <asm-generic/stack.h>
-#include <asm-generic/bits/bind.h>
 #include <nucleus/sched.h>
 #include <uitron/uitron.h>
 
diff --git a/src/skins/vrtx/init.c b/src/skins/vrtx/init.c
index f14cd20..52abf7e 100644
--- a/src/skins/vrtx/init.c
+++ b/src/skins/vrtx/init.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <vrtx/vrtx.h>
-#include <asm-generic/bits/bind.h>
+#include <asm/xenomai/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
 
 int __vrtx_muxid = -1;
diff --git a/src/skins/vxworks/init.c b/src/skins/vxworks/init.c
index c61b4d9..48bd3df 100644
--- a/src/skins/vxworks/init.c
+++ b/src/skins/vxworks/init.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <vxworks/vxworks.h>
-#include <asm-generic/bits/bind.h>
+#include <asm/xenomai/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
 
 int __vxworks_muxid = -1;
diff --git a/src/testsuite/sigtest/sigtest.c b/src/testsuite/sigtest/sigtest.c
index 628d573..156f736 100644
--- a/src/testsuite/sigtest/sigtest.c
+++ b/src/testsuite/sigtest/sigtest.c
@@ -8,10 +8,10 @@
 #include <execinfo.h>
 #endif /* !__UCLIBC__ */
 
-#include <asm-generic/xenomai/bits/bind.h>
 #include <asm-generic/bits/mlock_alert.h>
 #include <asm-generic/bits/sigshadow.h>
 #include <testing/sigtest_syscall.h>
+#include <asm/xenomai/bits/bind.h>
 
 #define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to