Module: xenomai-2.5 Branch: master Commit: 443c2c93ca822088fcf9de65cff128858affa0b8 URL: http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=443c2c93ca822088fcf9de65cff128858affa0b8
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Sun Jan 17 22:17:32 2010 +0100 arm: fix mm switching --- include/asm-arm/bits/pod.h | 5 +---- include/asm-arm/hal.h | 7 ------- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/include/asm-arm/bits/pod.h b/include/asm-arm/bits/pod.h index 6c8971f..469cd78 100644 --- a/include/asm-arm/bits/pod.h +++ b/include/asm-arm/bits/pod.h @@ -73,7 +73,6 @@ static inline void xnarch_switch_to(xnarchtcb_t *out_tcb, xnarchtcb_t *in_tcb) struct mm_struct *prev_mm = out_tcb->active_mm; struct task_struct *next = in_tcb->user_task; - if (likely(next != NULL)) { in_tcb->active_task = next; in_tcb->active_mm = in_tcb->mm; @@ -86,10 +85,8 @@ static inline void xnarch_switch_to(xnarchtcb_t *out_tcb, xnarchtcb_t *in_tcb) if (prev_mm != in_tcb->active_mm) { /* Switch to new user-space thread? */ - if (in_tcb->active_mm) { + if (in_tcb->active_mm) switch_mm(prev_mm, in_tcb->active_mm, next); - rthal_set_active_mm(in_tcb->active_mm); - } if (!next->mm) enter_lazy_tlb(prev_mm, next); } diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h index b818e17..4215096 100644 --- a/include/asm-arm/hal.h +++ b/include/asm-arm/hal.h @@ -166,13 +166,6 @@ static inline struct mm_struct *rthal_get_active_mm(void) #endif /* !TIF_MMSWITCH_INT */ } -static inline void rthal_set_active_mm(struct mm_struct *mm) -{ -#ifdef TIF_MMSWITCH_INT - per_cpu(ipipe_active_mm, rthal_processor_id()) = mm; -#endif /* TIF_MMSWITCH_INT */ -} - /* Private interface -- Internal use only */ asmlinkage void rthal_thread_switch(struct task_struct *prev, _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git