X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=arch%2Fx86%2Flib%2Fdelay_64.c;h=ff3dfecdb6f9c49589155771c02b8359a08ae3ec;hb=7e58818d32c18197602d1869b22cfda99efd05fe;hp=d0326d07c845bb9cfe806ae5b74a4ed14058e427;hpb=a76febe975997b933b7285b6e20bb0a21c09d453;p=firefly-linux-kernel-4.4.55.git

diff --git a/arch/x86/lib/delay_64.c b/arch/x86/lib/delay_64.c
index d0326d07c845..ff3dfecdb6f9 100644
--- a/arch/x86/lib/delay_64.c
+++ b/arch/x86/lib/delay_64.c
@@ -103,9 +103,16 @@ EXPORT_SYMBOL(__delay);
 
 inline void __const_udelay(unsigned long xloops)
 {
-	__delay(((xloops * HZ *
-		cpu_data(raw_smp_processor_id()).loops_per_jiffy) >> 32) + 1);
+	int d0;
+	xloops *= 4;
+	__asm__("mull %%edx"
+		:"=d" (xloops), "=&a" (d0)
+		:"1" (xloops), "0"
+		(cpu_data(raw_smp_processor_id()).loops_per_jiffy * (HZ/4)));
+
+	__delay(++xloops);
 }
+
 EXPORT_SYMBOL(__const_udelay);
 
 void __udelay(unsigned long usecs)