From fd13e7471088664f46867c31439bc3f9f845be80 Mon Sep 17 00:00:00 2001 From: Ross Biro Date: Wed, 11 Jan 2006 22:43:51 +0100 Subject: [PATCH] --- yaml --- r: 17955 b: refs/heads/master c: 79c62cf1789f935280138b412bb750be84aec747 h: refs/heads/master i: 17953: 34a46ed3e47d3fc1e36f6e8b49bf7ae022be6db5 17951: 79bf74f69ec70f52e5424b7992d9f0f2e88d9f4f v: v3 --- [refs] | 2 +- trunk/arch/x86_64/lib/delay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ffbe16bfb5b9..929c249c93b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4e94072d9c3b19662537cbd5e2d37bcaeed3d9b +refs/heads/master: 79c62cf1789f935280138b412bb750be84aec747 diff --git a/trunk/arch/x86_64/lib/delay.c b/trunk/arch/x86_64/lib/delay.c index 841bd738a189..03c460cbdd1c 100644 --- a/trunk/arch/x86_64/lib/delay.c +++ b/trunk/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)