Index: linux-2.6.15-rc5-mm1/mm/page_alloc.c
===================================================================
--- linux-2.6.15-rc5-mm1.orig/mm/page_alloc.c	2005-12-06 18:03:27.000000000 -0800
+++ linux-2.6.15-rc5-mm1/mm/page_alloc.c	2005-12-06 18:48:27.000000000 -0800
@@ -1572,11 +1572,11 @@ static int __init build_zonelists_node(p
 {
 	struct zone *zone;
 
-	BUG_ON(k > ZONE_NORMAL);
+	BUG_ON(k > ZONE_HIGHMEM);
 	zone = pgdat->node_zones + k;
 	if (populated_zone(zone)) {
-#ifdef CONFIG_HIGHMEM
-		BUG_ON(k > ZONE_HIGHMEM)
+#ifndef CONFIG_HIGHMEM
+		BUG_ON(k > ZONE_NORMAL);
 #endif
 		zonelist->zones[j++] = zone;
 	}