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

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Mon Oct 22 16:37:02 2012 +0200

arm/arith: fix compilation with tracer+thumb2

---

 include/asm-arm/arith.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-arm/arith.h b/include/asm-arm/arith.h
index 87e728f..a625a2d 100644
--- a/include/asm-arm/arith.h
+++ b/include/asm-arm/arith.h
@@ -3,7 +3,7 @@
 
 #include <asm/xenomai/features.h>
 
-#if __LINUX_ARM_ARCH__ >= 4
+#if __LINUX_ARM_ARCH__ >= 4 && (!defined(CONFIG_THUMB2_KERNEL) || 
!defined(CONFIG_FTRACE))
 static inline __attribute__((__const__)) unsigned long long
 rthal_arm_nodiv_ullimd(const unsigned long long op,
                       const unsigned long long frac,
@@ -32,7 +32,7 @@ rthal_arm_nodiv_llimd(const long long op,
 
 #include <asm-generic/xenomai/arith.h>
 
-#if __LINUX_ARM_ARCH__ >= 4
+#if __LINUX_ARM_ARCH__ >= 4 && (!defined(CONFIG_THUMB2_KERNEL) || 
!defined(CONFIG_FTRACE))
 #define rthal_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
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to