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

Author: Dmitriy Cherkasov <dmit...@mperpetuo.com>
Date:   Thu May  7 13:56:22 2015 -0700

cobalt/arm64: remove code for unrelated arm architecture

---

 .../arch/arm64/include/asm/xenomai/machine.h       |   33 --------------------
 .../arch/arm64/include/asm/xenomai/uapi/arith.h    |    4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h 
b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
index d6e965f..cf07a3f 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/machine.h
@@ -32,53 +32,20 @@
 #include <asm/compiler.h>
 #include <asm/cmpxchg.h>
 #include <asm/switch_to.h>
-#include <asm/system_info.h>
 #include <asm/system_misc.h>
 #include <asm/timex.h>
 #include <asm/processor.h>
 #include <asm/ipipe.h>
-#include <asm/mach/irq.h>
 #include <asm/cacheflush.h>
 
 #define xnarch_cache_aliasing() cache_is_vivt()
 
-#if __LINUX_ARM_ARCH__ < 5
-static inline __attribute_const__ unsigned long ffnz(unsigned long x)
-{
-       int r = 0;
-
-       if (!x)
-               return 0;
-       if (!(x & 0xffff)) {
-               x >>= 16;
-               r += 16;
-       }
-       if (!(x & 0xff)) {
-               x >>= 8;
-               r += 8;
-       }
-       if (!(x & 0xf)) {
-               x >>= 4;
-               r += 4;
-       }
-       if (!(x & 3)) {
-               x >>= 2;
-               r += 2;
-       }
-       if (!(x & 1)) {
-               x >>= 1;
-               r += 1;
-       }
-       return r;
-}
-#else
 static inline __attribute_const__ unsigned long ffnz(unsigned long ul)
 {
        int __r;
        __asm__("clz\t%0, %1" : "=r" (__r) : "r"(ul & (-ul)) : "cc");
        return 31 - __r;
 }
-#endif
 
 #include <asm-generic/xenomai/machine.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 cf897b4..165cd9d 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/arith.h
@@ -20,7 +20,7 @@
 
 #include <asm/xenomai/uapi/features.h>
 
-#if __LINUX_ARM_ARCH__ >= 4 && (!defined(CONFIG_THUMB2_KERNEL) || 
!defined(CONFIG_FTRACE))
+#if !defined(CONFIG_FTRACE)
 static inline __attribute__((__const__)) unsigned long long
 mach_arm_nodiv_ullimd(const unsigned long long op,
                       const unsigned long long frac,
@@ -49,7 +49,7 @@ mach_arm_nodiv_llimd(const long long op,
 
 #include <cobalt/uapi/asm-generic/arith.h>
 
-#if __LINUX_ARM_ARCH__ >= 4 && (!defined(CONFIG_THUMB2_KERNEL) || 
!defined(CONFIG_FTRACE))
+#if !defined(CONFIG_FTRACE)
 #define mach_arm_nodiv_ullimd_str                      \
        "umull %[tl], %[rl], %[opl], %[fracl]\n\t"      \
        "umull %[rm], %[rh], %[oph], %[frach]\n\t"      \


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

Reply via email to