lkml.org 
[lkml]   [2011]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [RFC/PATCH 6/7] x86, mm: Prepare zone_sizes_init() for unification
On Fri, 28 Oct 2011, Pekka Enberg wrote:

> diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
> index 6101894..12274fb 100644
> --- a/arch/x86/mm/init_32.c
> +++ b/arch/x86/mm/init_32.c
> @@ -677,10 +677,14 @@ 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
> max_zone_pfns[ZONE_HIGHMEM] = max_pfn;
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index f6b1f08..06c4360 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -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);
> }

I'd just fold patch 7 into this, it doesn't make much sense to have add
CONFIG_HIGHMEM code for 64-bit, for example, just to make the next patch
simpler.


\
 
 \ /
  Last update: 2011-10-31 23:59    [from the cache]
©2003-2011 Jasper Spaans