Merge git://oss.sgi.com:8090/xfs-2.6

[linux-2.6] / include / asm-cris / system.h

diff --git a/include/asm-cris/system.h b/include/asm-cris/system.h
index e06739806d4e4928e1c55094196899e7cacfe158..b1c593b6dbff163df5118bc6ba8c5841148fd43a 100644 (file)
--- a/include/asm-cris/system.h
+++ b/include/asm-cris/system.h
@@ -8,7 +8,6 @@
  */
 
 extern struct task_struct *resume(struct task_struct *prev, struct task_struct *next, int);
-#define prepare_to_switch()     do { } while(0)
 #define switch_to(prev,next,last) last = resume(prev,next, \
                                         (int)&((struct task_struct *)0)->thread)
 
@@ -41,7 +40,7 @@ extern struct task_struct *resume(struct task_struct *prev, struct task_struct *
 void disable_hlt(void);
 void enable_hlt(void);
 
-extern inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
+static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
 {
   /* since Etrax doesn't have any atomic xchg instructions, we need to disable
      irq's (if enabled) and do it with move.d's */
@@ -71,4 +70,6 @@ extern inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
 
 #define arch_align_stack(x) (x)
 
+void default_idle(void);
+
 #endif