[PATCH] Check for disabled local interrupts in "might_sleep()"

Self explanatory, as per the discussion last week.

diff --git a/kernel/sched.c b/kernel/sched.c
index 346553006428feeab97c56b487e0395ff6d61609..c7c479fe65d9c6b63370d1a766a64c6f57d86acc 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2554,7 +2554,7 @@ void __might_sleep(char *file, int line)
 #if defined(in_atomic)
        static unsigned long prev_jiffy;        /* ratelimiting */
 
-       if (in_atomic()) {
+       if (in_atomic() || irqs_disabled()) {
                if (time_before(jiffies, prev_jiffy + HZ))
                        return;
                prev_jiffy = jiffies;