The patch titled
warn if we sleep in an irq for a long time.
has been removed from the -mm tree. Its filename is
debug-warn-if-we-sleep-in-an-irq-for-a-long-time.patch
This patch was dropped because it got rejects and caused me grief anwyay
------------------------------------------------------
Subject: warn if we sleep in an irq for a long time.
From: Dave Jones <davej@xxxxxxxxxx>
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@xxxxxxxxxxxxx>
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/delay.h | 17 ++++++++---------
1 file 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
--- devel/include/linux/delay.h~debug-warn-if-we-sleep-in-an-irq-for-a-long-time 2006-06-09 15:18:46.000000000 -0700
+++ devel-akpm/include/linux/delay.h 2006-06-09 15:18:46.000000000 -0700
@@ -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)
_
Patches currently in -mm which might be from davej@xxxxxxxxxx are
origin.patch
git-acpi.patch
git-agpgart.patch
git-block.patch
git-cpufreq.patch
remove-silly-messages-from-input-layer.patch
fix-ide-locking-error.patch
post-halloween-doc.patch
debug-warn-if-we-sleep-in-an-irq-for-a-long-time.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
