diff options
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r-- | include/linux/mmzone.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index fef08c6cf75e..87a4045580f2 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -235,7 +235,7 @@ struct zone { | |||
235 | 235 | ||
236 | #ifndef CONFIG_SPARSEMEM | 236 | #ifndef CONFIG_SPARSEMEM |
237 | /* | 237 | /* |
238 | * Flags for a MAX_ORDER_NR_PAGES block. See pageblock-flags.h. | 238 | * Flags for a pageblock_nr_pages block. See pageblock-flags.h. |
239 | * In SPARSEMEM, this map is stored in struct mem_section | 239 | * In SPARSEMEM, this map is stored in struct mem_section |
240 | */ | 240 | */ |
241 | unsigned long *pageblock_flags; | 241 | unsigned long *pageblock_flags; |
@@ -740,7 +740,7 @@ extern struct zone *next_zone(struct zone *zone); | |||
740 | #define PAGE_SECTION_MASK (~(PAGES_PER_SECTION-1)) | 740 | #define PAGE_SECTION_MASK (~(PAGES_PER_SECTION-1)) |
741 | 741 | ||
742 | #define SECTION_BLOCKFLAGS_BITS \ | 742 | #define SECTION_BLOCKFLAGS_BITS \ |
743 | ((1 << (PFN_SECTION_SHIFT - (MAX_ORDER-1))) * NR_PAGEBLOCK_BITS) | 743 | ((1UL << (PFN_SECTION_SHIFT - pageblock_order)) * NR_PAGEBLOCK_BITS) |
744 | 744 | ||
745 | #if (MAX_ORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS | 745 | #if (MAX_ORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS |
746 | #error Allocator MAX_ORDER exceeds SECTION_SIZE | 746 | #error Allocator MAX_ORDER exceeds SECTION_SIZE |