diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 16:26:28 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 16:26:28 +0100 |
| commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
| tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /arch/x86_64/lib/delay.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | [PATCH] libata: add a function to decide if we need iordy (diff) | |
| download | linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.xz linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.zip | |
Merge branch 'upstream'
Diffstat (limited to 'arch/x86_64/lib/delay.c')
| -rw-r--r-- | arch/x86_64/lib/delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/lib/delay.c b/arch/x86_64/lib/delay.c index 841bd738a189..03c460cbdd1c 100644 --- a/arch/x86_64/lib/delay.c +++ b/arch/x86_64/lib/delay.c @@ -39,7 +39,7 @@ void __delay(unsigned long loops) inline void __const_udelay(unsigned long xloops) { - __delay(((xloops * cpu_data[raw_smp_processor_id()].loops_per_jiffy) >> 32) * HZ); + __delay((xloops * HZ * cpu_data[raw_smp_processor_id()].loops_per_jiffy) >> 32); } void __udelay(unsigned long usecs) |