Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / mm / internal.h

diff --git a/mm/internal.h b/mm/internal.h
index 802c3a4..7f22a11 100644 (file)
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -144,7 +144,10 @@ struct compact_control {
        int order;                      /* order a direct compactor needs */
        int migratetype;                /* MOVABLE, RECLAIMABLE etc */
        struct zone *zone;
-       bool contended;                 /* True if a lock was contended */
+       bool contended;                 /* True if a lock was contended, or
+                                        * need_resched() true during async
+                                        * compaction
+                                        */
 };
 
 unsigned long