vserver 1.9.5.x5

[linux-2.6.git] / include / asm-arm / delay.h

diff --git a/include/asm-arm/delay.h b/include/asm-arm/delay.h
index 4ebcea0..1704360 100644 (file)
--- a/include/asm-arm/delay.h
+++ b/include/asm-arm/delay.h
@@ -1,14 +1,22 @@
-#ifndef __ASM_ARM_DELAY_H
-#define __ASM_ARM_DELAY_H
-
 /*
- * Copyright (C) 1995 Russell King
+ * Copyright (C) 1995-2004 Russell King
  *
  * Delay routines, using a pre-computed "loops_per_second" value.
  */
+#ifndef __ASM_ARM_DELAY_H
+#define __ASM_ARM_DELAY_H
 
 extern void __delay(int loops);
 
+/*
+ * This function intentionally does not exist; if you see references to
+ * it, it means that you're calling udelay() with an out of range value.
+ *
+ * With currently imposed limits, this means that we support a max delay
+ * of 2000us and 671 bogomips
+ */
+extern void __bad_udelay(void);
+
 /*
  * division by multiplication: you don't have to worry about
  * loss of precision.
@@ -19,14 +27,16 @@ extern void __delay(int loops);
  * first constant multiplications gets optimized away if the delay is
  * a constant)
  */
-extern void udelay(unsigned long usecs);
+extern void __udelay(unsigned long usecs);
+extern void __const_udelay(unsigned long);
 
-static inline unsigned long muldiv(unsigned long a, unsigned long b, unsigned long c)
-{
-       return a * b / c;
-}
+#define MAX_UDELAY_MS 2
 
-       
+#define udelay(n)                                              \
+       (__builtin_constant_p(n) ?                              \
+         ((n) > (MAX_UDELAY_MS * 1000) ? __bad_udelay() :      \
+                       __const_udelay((n) * 0x68dbul)) :       \
+         __udelay(n))
 
 #endif /* defined(_ARM_DELAY_H) */