From: Dave Jones <davej@redhat.com>

We've been carrying this in Fedora/RHEL for a dogs age.  It occasionally
trips something up (especially in out-of-tree modules)

(Originally by Arjan, with trivial rediffing by me over time)

Cc: Arjan van de Ven <arjanv@infradead.org>
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/delay.h |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff -puN include/linux/delay.h~debug-warn-if-we-sleep-in-an-irq-for-a-long-time include/linux/delay.h
--- 25/include/linux/delay.h~debug-warn-if-we-sleep-in-an-irq-for-a-long-time	Mon Dec 12 15:46:31 2005
+++ 25-akpm/include/linux/delay.h	Mon Dec 12 15:46:31 2005
@@ -10,7 +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
  * risk overflow for high loops_per_jiffy (high bogomips) machines. The
@@ -25,14 +25,13 @@ 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);})
-#else
-#define mdelay(n) (\
-	(__builtin_constant_p(n) && (n)<=MAX_UDELAY_MS) ? udelay((n)*1000) : \
-	({unsigned long __ms=(n); while (__ms--) udelay(1000);}))
-#endif
+#define mdelay(n) (					\
+	{						\
+		static int warned=0; 			\
+		unsigned long __ms=(n); 		\
+		WARN_ON(in_irq() && !(warned++)); 	\
+		while (__ms--) udelay(1000);		\
+	})
 
 #ifndef ndelay
 #define ndelay(x)	udelay(((x)+999)/1000)
_