patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-arm / system.h

diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 9c26aec..d500cc9 100644 (file)
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -137,22 +137,48 @@ extern unsigned int user_debug;
 #define set_wmb(var, value) do { var = value; wmb(); } while (0)
 #define nop() __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t");
 
-#define prepare_to_switch()    do { } while(0)
+#ifdef CONFIG_SMP
+/*
+ * Define our own context switch locking.  This allows us to enable
+ * interrupts over the context switch, otherwise we end up with high
+ * interrupt latency.  The real problem area is switch_mm() which may
+ * do a full cache flush.
+ */
+#define prepare_arch_switch(rq,next)                                   \
+do {                                                                   \
+       spin_lock(&(next)->switch_lock);                                \
+       spin_unlock_irq(&(rq)->lock);                                   \
+} while (0)
+
+#define finish_arch_switch(rq,prev)                                    \
+       spin_unlock(&(prev)->switch_lock)
+
+#define task_running(rq,p)                                             \
+       ((rq)->curr == (p) || spin_is_locked(&(p)->switch_lock))
+#else
+/*
+ * Our UP-case is more simple, but we assume knowledge of how
+ * spin_unlock_irq() and friends are implemented.  This avoids
+ * us needlessly decrementing and incrementing the preempt count.
+ */
+#define prepare_arch_switch(rq,next)   local_irq_enable()
+#define finish_arch_switch(rq,prev)    spin_unlock(&(rq)->lock)
+#define task_running(rq,p)             ((rq)->curr == (p))
+#endif
 
 /*
  * switch_to(prev, next) should switch from task `prev' to `next'
- * `prev' will never be the same as `next'.
- * The `mb' is to tell GCC not to cache `current' across this call.
+ * `prev' will never be the same as `next'.  schedule() itself
+ * contains the memory barrier to tell GCC not to cache `current'.
  */
 struct thread_info;
 struct task_struct;
 extern struct task_struct *__switch_to(struct task_struct *, struct thread_info *, struct thread_info *);
 
-#define switch_to(prev,next,last)                                              \
-       do {                                                                    \
-               last = __switch_to(prev,prev->thread_info,next->thread_info);   \
-               mb();                                                           \
-       } while (0)
+#define switch_to(prev,next,last)                                      \
+do {                                                                   \
+       last = __switch_to(prev,prev->thread_info,next->thread_info);   \
+} while (0)
 
 /*
  * CPU interrupt mask handling.