fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/linux/delay.h b/include/linux/delay.h
index 36abaa6..d5f0f01 100644 (file)
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -10,6 +10,7 @@
 extern unsigned long loops_per_jiffy;
 
 #include <asm/delay.h>
+#include <linux/hardirq.h>
 
 /*
  * Using udelay() for intervals greater than a few milliseconds can
@@ -25,17 +26,33 @@ extern unsigned long loops_per_jiffy;
 #define MAX_UDELAY_MS  5
 #endif
 
-#ifdef notdef
-#define mdelay(n) (\
-       {unsigned long __ms=(n); while (__ms--) udelay(1000);})
+#ifndef mdelay
+#ifdef CONFIG_DEBUG_SLEEP_IN_IRQ
+#define mdelay(n) (                       \
+{                                         \
+       static int warned=0;              \
+       unsigned long __ms=(n);           \
+       WARN_ON(in_irq() && !(warned++)); \
+       while (__ms--) udelay(1000);      \
+})
 #else
 #define mdelay(n) (\
        (__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : \
        ({unsigned long __ms=(n); while (__ms--) udelay(1000);}))
 #endif
+#endif
 
 #ifndef ndelay
 #define ndelay(x)      udelay(((x)+999)/1000)
 #endif
 
+void calibrate_delay(void);
+void msleep(unsigned int msecs);
+unsigned long msleep_interruptible(unsigned int msecs);
+
+static inline void ssleep(unsigned int seconds)
+{
+       msleep(seconds * 1000);
+}
+
 #endif /* defined(_LINUX_DELAY_H) */