diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
| commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
| tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /include/asm-ia64/delay.h | |
| parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
| parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ia64/delay.h')
| -rw-r--r-- | include/asm-ia64/delay.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h index 57182d6f2b9a..bba702076391 100644 --- a/include/asm-ia64/delay.h +++ b/include/asm-ia64/delay.h | |||
| @@ -84,14 +84,6 @@ __delay (unsigned long loops) | |||
| 84 | ia64_delay_loop (loops - 1); | 84 | ia64_delay_loop (loops - 1); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | static __inline__ void | 87 | extern void udelay (unsigned long usecs); |
| 88 | udelay (unsigned long usecs) | ||
| 89 | { | ||
| 90 | unsigned long start = ia64_get_itc(); | ||
| 91 | unsigned long cycles = usecs*local_cpu_data->cyc_per_usec; | ||
| 92 | |||
| 93 | while (ia64_get_itc() - start < cycles) | ||
| 94 | cpu_relax(); | ||
| 95 | } | ||
| 96 | 88 | ||
| 97 | #endif /* _ASM_IA64_DELAY_H */ | 89 | #endif /* _ASM_IA64_DELAY_H */ |