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

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Mon Dec 10 01:42:27 2012 +0100

arm/hal: use the ipipe_get_active_mm service provided by the I-pipe core patches

---

 include/asm-arm/hal.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h
index 68f6542..b6c5ac6 100644
--- a/include/asm-arm/hal.h
+++ b/include/asm-arm/hal.h
@@ -207,10 +207,10 @@ static inline void rthal_timer_program_shot (unsigned 
long delay)
 
 static inline struct mm_struct *rthal_get_active_mm(void)
 {
-#if !defined(TIF_MMSWITCH_INT) || !defined(CONFIG_XENO_HW_UNLOCKED_SWITCH)
+#if defined(CONFIG_IPIPE_CORE)
+       return ipipe_get_active_mm();
+#elif !defined(TIF_MMSWITCH_INT) || !defined(CONFIG_XENO_HW_UNLOCKED_SWITCH)
        return current->active_mm;
-#elif defined(CONFIG_IPIPE_CORE)
-       return __this_cpu_read(ipipe_percpu.active_mm);
 #else /* !CONFIG_IPIPE_CORE */
        return per_cpu(ipipe_active_mm, smp_processor_id());
 #endif /* !CONFIG_IPIPE_CORE */


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

Reply via email to