git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc64
/
lib
/
delay.c
diff --git
a/arch/sparc64/lib/delay.c
b/arch/sparc64/lib/delay.c
index
f6b4c78
..
fb27e54
100644
(file)
--- a/
arch/sparc64/lib/delay.c
+++ b/
arch/sparc64/lib/delay.c
@@
-1,6
+1,6
@@
/* delay.c: Delay loops for sparc64
*
/* delay.c: Delay loops for sparc64
*
- * Copyright (C) 2004
David S. Miller <davem@redhat.com
>
+ * Copyright (C) 2004
, 2006 David S. Miller <davem@davemloft.net
>
*
* Based heavily upon x86 variant which is:
* Copyright (C) 1993 Linus Torvalds
*
* Based heavily upon x86 variant which is:
* Copyright (C) 1993 Linus Torvalds
@@
-8,19
+8,16
@@
*/
#include <linux/delay.h>
*/
#include <linux/delay.h>
+#include <asm/timer.h>
void __delay(unsigned long loops)
{
void __delay(unsigned long 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");
+ unsigned long bclock, now;
+
+ bclock = tick_ops->get_tick();
+ do {
+ now = tick_ops->get_tick();
+ } while ((now-bclock) < loops);
}
/* We used to multiply by HZ after shifting down by 32 bits
}
/* We used to multiply by HZ after shifting down by 32 bits
@@
-31,7
+28,7
@@
void __const_udelay(unsigned long n)
{
n *= 4;
{
n *= 4;
- n *= (cpu_data(_smp_processor_id()).udelay_val * (HZ/4));
+ n *= (cpu_data(
raw
_smp_processor_id()).udelay_val * (HZ/4));
n >>= 32;
__delay(n + 1);
n >>= 32;
__delay(n + 1);