The patch titled
reduce MAX_NR_ZONES: fix i386 SRAT check for MAX_NR_ZONES
has been added to the -mm tree. Its filename is
reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: reduce MAX_NR_ZONES: fix i386 SRAT check for MAX_NR_ZONES
From: Christoph Lameter <clameter@xxxxxxx>
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>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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[].
*/
_
Patches currently in -mm which might be from clameter@xxxxxxx are
zvc-add-__inc_zone_state-for-smp-configuration.patch
reduce-max_nr_zones-remove-two-strange-uses-of-max_nr_zones.patch
reduce-max_nr_zones-fix-max_nr_zones-array-initializations.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem.patch
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h.patch
reduce-max_nr_zones-page-allocator-zone_highmem-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment.patch
reduce-max_nr_zones-make-zone_dma32-optional.patch
reduce-max_nr_zones-make-zone_highmem-optional.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones.patch
reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
