diff options
| author | Tony Luck <tony.luck@intel.com> | 2004-12-15 19:59:51 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2004-12-15 19:59:51 -0800 |
| commit | 4a179a4674653175919df2b15edbe79f0d022758 (patch) | |
| tree | 37916ad42dcc7f2d52b54072fc824a2601f04585 /include | |
| parent | 9d53e4dd111c4bcb1f55961fce39823e340016f6 (diff) | |
| parent | 02a26c3e558582c1bd391fb758a776565784e1c3 (diff) | |
Merge intel.com:/data/home/aegl/BK/Linus
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10
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 */ |