Module: xenomai-forge
Branch: next
Commit: f5f994258d190d1f1da49548181f82a2f4eb4c72
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=f5f994258d190d1f1da49548181f82a2f4eb4c72

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon Sep  1 21:06:28 2014 +0200

cobalt/uapi: make cobalt_featinfo 32/64bit-neutral

---

 include/cobalt/uapi/asm-generic/features.h                 |   12 +++++++-----
 .../cobalt/arch/nios2/include/asm/xenomai/uapi/features.h  |    4 +++-
 kernel/cobalt/arch/sh/include/asm/xenomai/uapi/features.h  |    4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/include/cobalt/uapi/asm-generic/features.h 
b/include/cobalt/uapi/asm-generic/features.h
index b93d774..797e4ce 100644
--- a/include/cobalt/uapi/asm-generic/features.h
+++ b/include/cobalt/uapi/asm-generic/features.h
@@ -18,19 +18,21 @@
 #ifndef _COBALT_UAPI_ASM_GENERIC_FEATURES_H
 #define _COBALT_UAPI_ASM_GENERIC_FEATURES_H
 
+#include <linux/types.h>
+
 #define XNFEAT_STRING_LEN 64
 
 struct cobalt_featinfo {
-       unsigned long feat_all; /* Available feature set. */
+       __u32 feat_abirev;  /* ABI revision level. */
+       __u32 feat_all;     /* Available feature set. */
+       __u32 feat_man;     /* Mandatory features (when requested). */
+       __u32 feat_req;     /* Requested feature set. */
+       __u32 feat_mis;     /* Missing features. */
        char feat_all_s[XNFEAT_STRING_LEN];
-       unsigned long feat_man; /* Mandatory features (when requested). */
        char feat_man_s[XNFEAT_STRING_LEN];
-       unsigned long feat_req; /* Requested feature set. */
        char feat_req_s[XNFEAT_STRING_LEN];
-       unsigned long feat_mis; /* Missing features. */
        char feat_mis_s[XNFEAT_STRING_LEN];
        struct cobalt_featinfo_archdep feat_arch; /* Arch-dep extension. */
-       unsigned long feat_abirev; /* ABI revision level. */
 };
 
 #define __xn_feat_smp         0x80000000
diff --git a/kernel/cobalt/arch/nios2/include/asm/xenomai/uapi/features.h 
b/kernel/cobalt/arch/nios2/include/asm/xenomai/uapi/features.h
index 35dddb4..5f3985a 100644
--- a/kernel/cobalt/arch/nios2/include/asm/xenomai/uapi/features.h
+++ b/kernel/cobalt/arch/nios2/include/asm/xenomai/uapi/features.h
@@ -18,6 +18,8 @@
 #ifndef _COBALT_NIOS2_ASM_UAPI_FEATURES_H
 #define _COBALT_NIOS2_ASM_UAPI_FEATURES_H
 
+#include <linux/types.h>
+
 /* The ABI revision level we use on this arch. */
 #define XENOMAI_ABI_REV   8UL
 
@@ -29,7 +31,7 @@
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
 struct cobalt_featinfo_archdep {
-       unsigned long hrclock_membase;
+       __u32 hrclock_membase;
 };
 
 #include <cobalt/uapi/asm-generic/features.h>
diff --git a/kernel/cobalt/arch/sh/include/asm/xenomai/uapi/features.h 
b/kernel/cobalt/arch/sh/include/asm/xenomai/uapi/features.h
index f220da1..c38c403 100644
--- a/kernel/cobalt/arch/sh/include/asm/xenomai/uapi/features.h
+++ b/kernel/cobalt/arch/sh/include/asm/xenomai/uapi/features.h
@@ -18,6 +18,8 @@
 #ifndef _COBALT_SH_ASM_FEATURES_H
 #define _COBALT_SH_ASM_FEATURES_H
 
+#include <linux/types.h>
+
 /* The ABI revision level we use on this arch. */
 #define XENOMAI_ABI_REV   6UL
 
@@ -29,7 +31,7 @@
 #define XNARCH_HAVE_NODIV_LLIMD  1
 
 struct cobalt_featinfo_archdep {
-       unsigned long hrclock_membase;
+       __u32 hrclock_membase;
 };
 
 #include <cobalt/uapi/asm-generic/features.h>


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

Reply via email to