diff -Nru linux/include/asm-mips/system.h.orig linux/include/asm-mips/system.h
--- linux/include/asm-mips/system.h.orig	2004-03-09 16:41:35.000000000 -0800
+++ linux/include/asm-mips/system.h	2004-03-19 15:17:42.000000000 -0800
@@ -490,16 +490,4 @@
 	return serial_console ? 0 : 1;
 }
 
-/*
- * Taken from include/asm-ia64/system.h; prevents deadlock on SMP
- * systems.
- */
-#define prepare_arch_switch(rq, next)		\
-do {						\
-	spin_lock(&(next)->switch_lock);	\
-	spin_unlock(&(rq)->lock);		\
-} while (0)
-#define finish_arch_switch(rq, prev)	spin_unlock_irq(&(prev)->switch_lock)
-#define task_running(rq, p) 		((rq)->curr == (p) || spin_is_locked(&(p)->switch_lock))
-
 #endif /* _ASM_SYSTEM_H */