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

Commit 248b52b9 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86, mm: Prepare zone_sizes_init() for unification 



Make 32-bit and 64-bit zone_sizes_init() identical in
preparation for unification.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1320155902-10424-6-git-send-email-penberg@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ece838b6

arch/x86/mm/init_32.c

+4 −0
Original line number Diff line number Diff line
@@ -677,9 +677,13 @@ void __init initmem_init(void) 
static void __init zone_sizes_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;

#endif

#ifdef CONFIG_ZONE_DMA32

        max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

arch/x86/mm/init_64.c

+3 −0
Original line number Diff line number Diff line
@@ -624,6 +624,9 @@ static void __init zone_sizes_init(void) 
	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM] = max_pfn;

#endif



	free_area_init_nodes(max_zone_pfns);

}