diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-15 23:31:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-15 23:31:16 -0800 |
| commit | ccb5a4612bc140955de2089abf599bc9abde1846 (patch) | |
| tree | a471d6035833cdab81bb6de9bb565042ed0542af /include | |
| parent | 1b6d94aaeeddec2327e7e20d3d21c7581a577ca6 (diff) | |
| parent | 01ef13d0f7de81626f6d1efb60579bf810d4b479 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h index aa627cfd88f5..57182d6f2b9a 100644 --- a/include/asm-ia64/delay.h +++ b/include/asm-ia64/delay.h @@ -91,7 +91,7 @@ udelay (unsigned long usecs) unsigned long cycles = usecs*local_cpu_data->cyc_per_usec; while (ia64_get_itc() - start < cycles) - /* skip */; + cpu_relax(); } #endif /* _ASM_IA64_DELAY_H */ |