[PATCH 11/11] Fix i386 SRAT check for MAX_NR_ZONES

From: Christoph Lameter
Date: Fri Jul 07 2006 - 19:19:04 EST


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 <clameter@xxxxxxx>

Index: linux-2.6.17-mm6/arch/i386/kernel/srat.c
===================================================================
--- linux-2.6.17-mm6.orig/arch/i386/kernel/srat.c 2006-07-03 13:47:12.667481297 -0700
+++ linux-2.6.17-mm6/arch/i386/kernel/srat.c 2006-07-04 07:59:13.710812064 -0700
@@ -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[].
*/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/