Pull dock-bay into release branch

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

diff --git a/include/asm-arm26/system.h b/include/asm-arm26/system.h
index d1f69d7061986b4f6ce2588e949205dade591a9d..e09da5ff1f54d2198fa5dbbbc94b86fe25510a8e 100644 (file)
--- a/include/asm-arm26/system.h
+++ b/include/asm-arm26/system.h
@@ -52,8 +52,6 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
 #define xchg(ptr,x) \
        ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr),1))
-
 extern asmlinkage void __backtrace(void);
 
 #define set_cr(x)                                      \
@@ -90,7 +88,6 @@ extern unsigned int user_debug;
 
 #define read_barrier_depends() do { } while(0)
 #define set_mb(var, value)  do { var = value; mb(); } while (0)
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
 
 /*
  * We assume knowledge of how
@@ -112,16 +109,6 @@ do {                                                                       \
        last = __switch_to(prev,task_thread_info(prev),task_thread_info(next)); \
 } while (0)
 
-/*
- * On SMP systems, when the scheduler does migration-cost autodetection,
- * it needs a way to flush as much of the CPU's caches as possible.
- *
- * TODO: fill this in!
- */
-static inline void sched_cacheflush(void)
-{
-}
-
 /*
  * Save the current interrupt enable state & disable IRQs
  */