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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sat Oct 17 14:40:53 2015 +0200

cobalt/arm64: fix inclusion guards

---

 kernel/cobalt/arch/arm64/include/asm/xenomai/features.h      |    8 ++++----
 kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h        |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h       |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h       |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/syscall32.h     |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h        |    7 +++----
 kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h    |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/features.h |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h   |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/syscall.h  |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/tsc.h      |    6 +++---
 kernel/cobalt/arch/arm64/include/asm/xenomai/wrappers.h      |    6 +++---
 12 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/features.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/features.h
index d485286..112408f 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/features.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/features.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Philippe Gerum <r...@xenomai.org>.
+ * Copyright (C) 2015 Philippe Gerum <r...@xenomai.org>.
  *
  * ARM port
  *   Copyright (C) 2005 Stelian Pop
@@ -19,12 +19,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_FEATURES_H
-#define _COBALT_ARM_ASM_FEATURES_H
+#ifndef _COBALT_ARM64_ASM_FEATURES_H
+#define _COBALT_ARM64_ASM_FEATURES_H
 
 struct cobalt_featinfo;
 static inline void collect_arch_features(struct cobalt_featinfo *p) { }
 
 #include <asm/xenomai/uapi/features.h>
 
-#endif /* !_COBALT_ARM_ASM_FEATURES_H */
+#endif /* !_COBALT_ARM64_ASM_FEATURES_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index 743d758..cfdf0b3 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_FPTEST_H
-#define _COBALT_ARM_ASM_FPTEST_H
+#ifndef _COBALT_ARM64_ASM_FPTEST_H
+#define _COBALT_ARM64_ASM_FPTEST_H
 
 #include <linux/errno.h>
 #include <asm/xenomai/uapi/fptest.h>
@@ -44,4 +44,4 @@ static inline int fp_detect(void)
        return have_fp ? __COBALT_HAVE_FPU : 0;
 }
 
-#endif /* _COBALT_ARM_ASM_FPTEST_H */
+#endif /* _COBALT_ARM64_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
index b8290bf..7444cc8 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
@@ -20,8 +20,8 @@
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  *   02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_MACHINE_H
-#define _COBALT_ARM_ASM_MACHINE_H
+#ifndef _COBALT_ARM64_ASM_MACHINE_H
+#define _COBALT_ARM64_ASM_MACHINE_H
 
 #include <linux/version.h>
 #include <asm/byteorder.h>
@@ -58,4 +58,4 @@ static inline __attribute_const__ unsigned long ffnz(unsigned 
long ul)
 
 #include <asm-generic/xenomai/machine.h>
 
-#endif /* !_COBALT_ARM_ASM_MACHINE_H */
+#endif /* !_COBALT_ARM64_ASM_MACHINE_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
index 77c1716..949f287 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_SYSCALL_H
-#define _COBALT_ARM_ASM_SYSCALL_H
+#ifndef _COBALT_ARM64_ASM_SYSCALL_H
+#define _COBALT_ARM64_ASM_SYSCALL_H
 
 #include <linux/errno.h>
 #include <asm/uaccess.h>
@@ -75,4 +75,4 @@ int xnarch_local_syscall(unsigned long a1, unsigned long a2,
                         unsigned long a3, unsigned long a4,
                         unsigned long a5);
 
-#endif /* !_COBALT_ARM_ASM_SYSCALL_H */
+#endif /* !_COBALT_ARM64_ASM_SYSCALL_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall32.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall32.h
index 95c5a11..a66ddd6 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall32.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall32.h
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_SYSCALL32_H
-#define _COBALT_ARM_ASM_SYSCALL32_H
+#ifndef _COBALT_ARM64_ASM_SYSCALL32_H
+#define _COBALT_ARM64_ASM_SYSCALL32_H
 
 #include <asm-generic/xenomai/syscall32.h>
 
-#endif /* !_COBALT_ARM_ASM_SYSCALL32_H */
+#endif /* !_COBALT_ARM64_ASM_SYSCALL32_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index bfcceb4..9055e58 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -16,12 +16,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_THREAD_H
-#define _COBALT_ARM_ASM_THREAD_H
+#ifndef _COBALT_ARM64_ASM_THREAD_H
+#define _COBALT_ARM64_ASM_THREAD_H
 
 #include <asm-generic/xenomai/thread.h>
 
-
 struct xnarchtcb {
        struct xntcb core;
 #ifdef CONFIG_XENO_ARCH_FPU
@@ -111,4 +110,4 @@ static inline void xnarch_enable_kfpu(void) { }
 
 static inline void xnarch_disable_kfpu(void) { }
 
-#endif /* !_COBALT_ARM_ASM_THREAD_H */
+#endif /* !_COBALT_ARM64_ASM_THREAD_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h
index 165cd9d..3d81f6e 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h
@@ -15,8 +15,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef _COBALT_ARM_ASM_UAPI_ARITH_H
-#define _COBALT_ARM_ASM_UAPI_ARITH_H
+#ifndef _COBALT_ARM64_ASM_UAPI_ARITH_H
+#define _COBALT_ARM64_ASM_UAPI_ARITH_H
 
 #include <asm/xenomai/uapi/features.h>
 
@@ -139,4 +139,4 @@ mach_arm_nodiv_llimd(const long long op,
 }
 #endif /* arm >= v4 */
 
-#endif /* _COBALT_ARM_ASM_UAPI_ARITH_H */
+#endif /* _COBALT_ARM64_ASM_UAPI_ARITH_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/features.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/features.h
index 3bea0ef..57d0f14 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/features.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/features.h
@@ -18,8 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef _COBALT_ARM_ASM_UAPI_FEATURES_H
-#define _COBALT_ARM_ASM_UAPI_FEATURES_H
+#ifndef _COBALT_ARM64_ASM_UAPI_FEATURES_H
+#define _COBALT_ARM64_ASM_UAPI_FEATURES_H
 
 /* The ABI revision level we use on this arch. */
 #define XENOMAI_ABI_REV   16UL
@@ -42,4 +42,4 @@ static inline const char *get_feature_label(unsigned int 
feature)
        return get_generic_feature_label(feature);
 }
 
-#endif /* !_COBALT_ARM_ASM_UAPI_FEATURES_H */
+#endif /* !_COBALT_ARM64_ASM_UAPI_FEATURES_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 25bc976..84607b7 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -15,8 +15,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
-#define _COBALT_ARM_ASM_UAPI_FPTEST_H
+#ifndef _COBALT_ARM64_ASM_UAPI_FPTEST_H
+#define _COBALT_ARM64_ASM_UAPI_FPTEST_H
 
 #define __COBALT_HAVE_FPU  0x1
 
@@ -102,4 +102,4 @@ static inline unsigned int fp_regs_check(int features, 
unsigned int val,
        return result;
 }
 
-#endif /* !_COBALT_ARM_ASM_UAPI_FPTEST_H */
+#endif /* !_COBALT_ARM64_ASM_UAPI_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/syscall.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/syscall.h
index c4e3593..60dabd5 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/syscall.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/syscall.h
@@ -18,8 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef _COBALT_ARM_ASM_UAPI_SYSCALL_H
-#define _COBALT_ARM_ASM_UAPI_SYSCALL_H
+#ifndef _COBALT_ARM64_ASM_UAPI_SYSCALL_H
+#define _COBALT_ARM64_ASM_UAPI_SYSCALL_H
 
 #define __xn_syscode(__nr)     (__COBALT_SYSCALL_BIT | (__nr))
 
@@ -31,4 +31,4 @@
 #define XENOMAI_SYSARCH_XCHG                   3
 #define XENOMAI_SYSARCH_TSCINFO                 4
 
-#endif /* !_COBALT_ARM_ASM_UAPI_SYSCALL_H */
+#endif /* !_COBALT_ARM64_ASM_UAPI_SYSCALL_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/tsc.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/tsc.h
index b17cfb2..20a4eaa 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/tsc.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/tsc.h
@@ -15,11 +15,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#ifndef _COBALT_ARM_ASM_UAPI_TSC_H
-#define _COBALT_ARM_ASM_UAPI_TSC_H
+#ifndef _COBALT_ARM64_ASM_UAPI_TSC_H
+#define _COBALT_ARM64_ASM_UAPI_TSC_H
 
 struct __xn_tscinfo {
        volatile unsigned int *counter;
 };
 
-#endif /* !_COBALT_ARM_ASM_UAPI_TSC_H */
+#endif /* !_COBALT_ARM64_ASM_UAPI_TSC_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/wrappers.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/wrappers.h
index fe59896..5a5754f 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/wrappers.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/wrappers.h
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
-#ifndef _COBALT_ARM_ASM_WRAPPERS_H
-#define _COBALT_ARM_ASM_WRAPPERS_H
+#ifndef _COBALT_ARM64_ASM_WRAPPERS_H
+#define _COBALT_ARM64_ASM_WRAPPERS_H
 
 #include <asm-generic/xenomai/wrappers.h> /* Read the generic portion. */
 
 #define __put_user_inatomic __put_user
 #define __get_user_inatomic __get_user
 
-#endif /* _COBALT_ARM_ASM_WRAPPERS_H */
+#endif /* _COBALT_ARM64_ASM_WRAPPERS_H */


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

Reply via email to