From: Christoph Lameter i386 SRAT: Fix MAX_NR_ZONES check We cannot check MAX_NR_ZONES since it not defined in the preprocessor anymore. So remove the check. The maximum number of zones per node for i386 is 3 since i386 does not support ZONE_DMA32. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- arch/i386/kernel/srat.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) diff -puN arch/i386/kernel/srat.c~reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones arch/i386/kernel/srat.c --- a/arch/i386/kernel/srat.c~reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones +++ a/arch/i386/kernel/srat.c @@ -42,7 +42,7 @@ #define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8) static u8 pxm_bitmap[PXM_BITMAP_LEN]; /* bitmap of proximity domains */ -#define MAX_CHUNKS_PER_NODE 4 +#define MAX_CHUNKS_PER_NODE 3 #define MAXCHUNKS (MAX_CHUNKS_PER_NODE * MAX_NUMNODES) struct node_memory_chunk_s { unsigned long start_pfn; @@ -135,9 +135,6 @@ static void __init parse_memory_affinity "enabled and removable" : "enabled" ) ); } -#if MAX_NR_ZONES != 4 -#error "MAX_NR_ZONES != 4, chunk_to_zone requires review" -#endif /* Take a chunk of pages from page frame cstart to cend and count the number * of pages in each zone, returned via zones[]. */ _