1 files changed, 13 insertions, 0 deletions

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index f6167f2fd7fb..322e8048463e 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/seqlock.h>
 #include <linux/nodemask.h>
+#include <linux/pageblock-flags.h>
 #include <asm/atomic.h>
 #include <asm/page.h>
 
@@ -222,6 +223,14 @@ struct zone {
 #endif
         struct free_area        free_area[MAX_ORDER];
 
+#ifndef CONFIG_SPARSEMEM
+        /*
+         * Flags for a MAX_ORDER_NR_PAGES block. See pageblock-flags.h.
+         * In SPARSEMEM, this map is stored in struct mem_section
+         */
+        unsigned long           *pageblock_flags;
+#endif /* CONFIG_SPARSEMEM */
+
 
         ZONE_PADDING(_pad1_)
 
@@ -720,6 +729,9 @@ extern struct zone *next_zone(struct zone *zone);
 #define PAGES_PER_SECTION       (1UL << PFN_SECTION_SHIFT)
 #define PAGE_SECTION_MASK       (~(PAGES_PER_SECTION-1))
 
+#define SECTION_BLOCKFLAGS_BITS \
+                ((SECTION_SIZE_BITS - (MAX_ORDER-1)) * NR_PAGEBLOCK_BITS)
+
 #if (MAX_ORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS
 #error Allocator MAX_ORDER exceeds SECTION_SIZE
 #endif
@@ -739,6 +751,7 @@ struct mem_section {
          * before using it wrong.
          */
         unsigned long section_mem_map;
+        DECLARE_BITMAP(pageblock_flags, SECTION_BLOCKFLAGS_BITS);
 };
 
 #ifdef CONFIG_SPARSEMEM_EXTREME