Module: xenomai-rpm
Branch: queue/mayday
Commit: b3d8d5e78a9d9994a1b178a7b97dc0313760be39
URL:    
http://git.xenomai.org/?p=xenomai-rpm.git;a=commit;h=b3d8d5e78a9d9994a1b178a7b97dc0313760be39

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon May 17 11:05:31 2010 +0200

powerpc/hal: test XENO_HW_UNLOCKED_SWITCH instead of 
IPIPE_WANT_PREEMPTIBLE_SWITCH

---

 include/asm-powerpc/bits/pod.h    |    4 ++--
 include/asm-powerpc/bits/sched.h  |    2 +-
 include/asm-powerpc/bits/shadow.h |    2 +-
 include/asm-powerpc/bits/thread.h |    2 +-
 include/asm-powerpc/hal.h         |    2 +-
 include/asm-powerpc/system.h      |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/asm-powerpc/bits/pod.h b/include/asm-powerpc/bits/pod.h
index 8fccba7..0502212 100644
--- a/include/asm-powerpc/bits/pod.h
+++ b/include/asm-powerpc/bits/pod.h
@@ -78,7 +78,7 @@ static inline void xnarch_leave_root(xnarchtcb_t * rootcb)
        rootcb->user_task = rootcb->active_task = p;
        rootcb->tsp = &p->thread;
        rootcb->mm = rootcb->active_mm = rthal_get_active_mm();
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        rootcb->tip = task_thread_info(p);
 #endif
 #ifdef CONFIG_XENO_HW_FPU
@@ -91,7 +91,7 @@ static inline void xnarch_leave_root(xnarchtcb_t * rootcb)
 
 static inline void xnarch_enter_root(xnarchtcb_t * rootcb)
 {
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        if (!rootcb->mm)
                set_ti_thread_flag(rootcb->tip, TIF_MMSWITCH_INT);
 #endif
diff --git a/include/asm-powerpc/bits/sched.h b/include/asm-powerpc/bits/sched.h
index 2253d8b..1d53d86 100644
--- a/include/asm-powerpc/bits/sched.h
+++ b/include/asm-powerpc/bits/sched.h
@@ -29,7 +29,7 @@ static inline void xnarch_init_root_tcb(xnarchtcb_t *tcb,
        tcb->tsp = &tcb->ts;
        tcb->mm = current->mm;
        tcb->active_mm = NULL;
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        tcb->tip = &tcb->ti;
 #endif
 #ifdef CONFIG_XENO_HW_FPU
diff --git a/include/asm-powerpc/bits/shadow.h 
b/include/asm-powerpc/bits/shadow.h
index 5287544..47b65a2 100644
--- a/include/asm-powerpc/bits/shadow.h
+++ b/include/asm-powerpc/bits/shadow.h
@@ -38,7 +38,7 @@ static inline void xnarch_init_shadow_tcb(xnarchtcb_t * tcb,
        tcb->tsp = &task->thread;
        tcb->mm = task->mm;
        tcb->active_mm = NULL;
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        tcb->tip = task_thread_info(task);
 #endif
 #ifdef CONFIG_XENO_HW_FPU
diff --git a/include/asm-powerpc/bits/thread.h 
b/include/asm-powerpc/bits/thread.h
index 4ff0d98..07e8faf 100644
--- a/include/asm-powerpc/bits/thread.h
+++ b/include/asm-powerpc/bits/thread.h
@@ -34,7 +34,7 @@ static inline void xnarch_init_tcb(xnarchtcb_t *tcb)
        tcb->tsp = &tcb->ts;
        tcb->mm = NULL;
        tcb->active_mm = NULL;
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        tcb->tip = &tcb->ti;
 #endif
        /* Note: .pgdir(ppc32) == NULL for a Xenomai kthread. */
diff --git a/include/asm-powerpc/hal.h b/include/asm-powerpc/hal.h
index 23c57dc..415366e 100644
--- a/include/asm-powerpc/hal.h
+++ b/include/asm-powerpc/hal.h
@@ -94,7 +94,7 @@ static inline void rthal_timer_program_shot(unsigned long 
delay)
 
 static inline struct mm_struct *rthal_get_active_mm(void)
 {
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        return per_cpu(ipipe_active_mm, smp_processor_id());
 #else
        return current->active_mm;
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index b4a11b7..0e1072a 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -54,7 +54,7 @@ typedef struct xnarchtcb {    /* Per-thread arch-dependent 
block */
 
        /* Kernel mode side */
        struct thread_struct ts;        /* Holds kernel-based thread context. */
-#ifdef CONFIG_IPIPE_WANT_PREEMPTIBLE_SWITCH
+#ifdef CONFIG_XENO_HW_UNLOCKED_SWITCH
        struct thread_info *tip; /* Pointer to the active thread info (ti or 
user->thread_info). */
        struct thread_info ti;  /* Holds kernel-based thread info */
 #endif


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

Reply via email to