Merge intel.com:/data/home/aegl/BK/Linus

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

Merge intel.com:/data/home/aegl/BK/Linus
into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10
4a179a46 · Tony Luck · 9d53e4dd · 02a26c3e · 4a179a46
Commit 4a179a46 authored Dec 15, 2004 by Tony Luck
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/asm-ia64/delay.h include/asm-ia64/delay.h +1 -1

No files found.
--- 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 */