linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / sparc64 / lib / delay.c

diff --git a/arch/sparc64/lib/delay.c b/arch/sparc64/lib/delay.c
index fb27e54..e880872 100644 (file)
--- a/arch/sparc64/lib/delay.c
+++ b/arch/sparc64/lib/delay.c
@@ -1,6 +1,6 @@
 /* delay.c: Delay loops for sparc64
  *
- * Copyright (C) 2004, 2006 David S. Miller <davem@davemloft.net>
+ * Copyright (C) 2004 David S. Miller <davem@redhat.com>
  *
  * Based heavily upon x86 variant which is:
  *     Copyright (C) 1993 Linus Torvalds
@@ -8,16 +8,19 @@
  */
 
 #include <linux/delay.h>
-#include <asm/timer.h>
 
 void __delay(unsigned long loops)
 {
-       unsigned long bclock, now;
-       
-       bclock = tick_ops->get_tick();
-       do {
-               now = tick_ops->get_tick();
-       } while ((now-bclock) < loops);
+       __asm__ __volatile__(
+"      b,pt    %%xcc, 1f\n"
+"       cmp    %0, 0\n"
+"      .align  32\n"
+"1:\n"
+"      bne,pt  %%xcc, 1b\n"
+"       subcc  %0, 1, %0\n"
+       : "=&r" (loops)
+       : "0" (loops)
+       : "cc");
 }
 
 /* We used to multiply by HZ after shifting down by 32 bits