[Linux-mips-commits]CVS: linux/arch/mips/kernel setup.c,1.58,1.59

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv25995/arch/mips/kernel

Modified Files:
	setup.c 
Log Message:
Moved au1k_wait() to kernel/setup.c to fix the compile problem.


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- setup.c	22 Apr 2002 17:45:01 -0000	1.58
+++ setup.c	23 Apr 2002 16:43:48 -0000	1.59
@@ -1177,6 +1177,18 @@
 		: "$1");
 }
 
+void au1k_wait(void)
+{
+#ifdef CONFIG_PM
+	/* using the wait instruction makes CP0 counter unusable */
+	__asm__(".set\tmips3\n\t"
+		"wait\n\t"
+		"nop\n\t" "nop\n\t" "nop\n\t" "nop\n\t" ".set\tmips0");
+#else
+	__asm__("nop\n\t" "nop\n\t");
+#endif
+}
+
 int __init fpu_disable(char *s)
 {
 	mips_cpu.options &= ~MIPS_CPU_FPU;