Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b15780 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] reduce MAX_NR_ZONES: fix i386 SRAT check for MAX_NR_ZONES 



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: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 27bf71c2

arch/i386/kernel/srat.c

+1 −4
Original line number Diff line number Diff line
@@ -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_structure (char *sratp) 
		 "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[].

 */