summaryrefslogtreecommitdiffstats
path: root/arch/um/sys-x86_64/delay.c
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2007-04-01 23:49:37 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-02 10:06:08 -0700
commit10fa1155a2c3282f421a74fedfad1957e8bdc86c (patch)
tree21ec69d27c0d5e239f9c0eed531dbcdc0f602af2 /arch/um/sys-x86_64/delay.c
parent05565b65a5309e3e5c86db1975b57f75661bee8f (diff)
downloadop-kernel-dev-10fa1155a2c3282f421a74fedfad1957e8bdc86c.zip
op-kernel-dev-10fa1155a2c3282f421a74fedfad1957e8bdc86c.tar.gz
[PATCH] uml: fix unreasonably long udelay
Currently we have a confused udelay implementation. * __const_udelay does not accept usecs but xloops in i386 and x86_64 * our implementation requires usecs as arg * it gets a xloops count when called by asm/arch/delay.h Bugs related to this (extremely long shutdown times) where reported by some x86_64 users, especially using Device Mapper. To hit this bug, a compile-time constant time parameter must be passed - that's why UML seems to work most times. Fix this with a simple udelay implementation. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/sys-x86_64/delay.c')
-rw-r--r--arch/um/sys-x86_64/delay.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/um/sys-x86_64/delay.c b/arch/um/sys-x86_64/delay.c
index 137f444..dee5be6 100644
--- a/arch/um/sys-x86_64/delay.c
+++ b/arch/um/sys-x86_64/delay.c
@@ -28,14 +28,3 @@ void __udelay(unsigned long usecs)
}
EXPORT_SYMBOL(__udelay);
-
-void __const_udelay(unsigned long usecs)
-{
- unsigned long i, n;
-
- n = (loops_per_jiffy * HZ * usecs) / MILLION;
- for(i=0;i<n;i++)
- cpu_relax();
-}
-
-EXPORT_SYMBOL(__const_udelay);
OpenPOWER on IntegriCloud