On Wed 29 May 2013 04:41:30 PM CST, Vineet Gupta wrote:
> Hi Jiang,
>
> On 05/08/2013 09:21 PM, Jiang Liu wrote:
>> Prepare for removing num_physpages and simplify mem_init().
>>
>> Signed-off-by: Jiang Liu <[email protected]>
>> Cc: Vineet Gupta <[email protected]>
>> Cc: James Hogan <[email protected]>
>> Cc: Rob Herring <[email protected]>
>> Cc: [email protected]
>> ---
>> arch/arc/mm/init.c | 36 +++---------------------------------
>> 1 file changed, 3 insertions(+), 33 deletions(-)
>>
>> diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
>> index 78d8c31..8ba6562 100644
>> --- a/arch/arc/mm/init.c
>> +++ b/arch/arc/mm/init.c
>> @@ -74,7 +74,7 @@ void __init setup_arch_memory(void)
>> /* Last usable page of low mem (no HIGHMEM yet for ARC port) */
>> max_low_pfn = max_pfn = PFN_DOWN(end_mem);
>>
>> - max_mapnr = num_physpages = max_low_pfn - min_low_pfn;
>> + max_mapnr = max_low_pfn - min_low_pfn;
>>
>> /*------------- reserve kernel image -----------------------*/
>> memblock_reserve(CONFIG_LINUX_LINK_BASE,
>> @@ -84,7 +84,7 @@ void __init setup_arch_memory(void)
>>
>> /*-------------- node setup --------------------------------*/
>> memset(zones_size, 0, sizeof(zones_size));
>> - zones_size[ZONE_NORMAL] = num_physpages;
>> + zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
>>
>> /*
>> * We can't use the helper free_area_init(zones[]) because it uses
>> @@ -106,39 +106,9 @@ void __init setup_arch_memory(void)
>> */
>> void __init mem_init(void)
>> {
>> - int codesize, datasize, initsize, reserved_pages, free_pages;
>> - int tmp;
>> -
>> high_memory = (void *)(CONFIG_LINUX_LINK_BASE + arc_mem_sz);
>> -
>> free_all_bootmem();
>> -
>
> What baseline is this code against, since mainline looks like following:
>
> high_memory = (void *)(CONFIG_LINUX_LINK_BASE + arc_mem_sz);
>
> totalram_pages = free_all_bootmem();
>
> So I would handve expected the following
>
> - totalram_pages = free_all_bootmem();
> + free_all_bootmem();
>
> Aha, you missed out CCing all maintainers on "[PATCH v7, part3 14/16]" or
> rather
> "[PATCH v8, part3 13/14]" - and it is difficult to dig this out from all the
> patches that fly by on linux-arch.
>
> Same goes for "[PATCH v8, part3 01/14]" and "[PATCH v8, part3 02/14]"
Hi Vineet,
This patchset is based on Andrew's mmotm tree, there are some
differences
between mmotm and the upstream kernel, sorry for the inconvenience.
Once I sent those common patches to all related maintainers, but
the CC list
is too long and also caused other troubles. Next time I will send all
patches to
linux-arch maillist.
>
>> - /* count all reserved pages [kernel code/data/mem_map..] */
>> - reserved_pages = 0;
>> - for (tmp = 0; tmp < max_mapnr; tmp++)
>> - if (PageReserved(mem_map + tmp))
>> - reserved_pages++;
>> -
>> - /* XXX: nr_free_pages() is equivalent */
>> - free_pages = max_mapnr - reserved_pages;
>> -
>> - /*
>> - * For the purpose of display below, split the "reserve mem"
>> - * kernel code/data is already shown explicitly,
>> - * Show any other reservations (mem_map[ ] et al)
>> - */
>> - reserved_pages -= (((unsigned int)_end - CONFIG_LINUX_LINK_BASE) >>
>> - PAGE_SHIFT);
>> -
>> - codesize = _etext - _text;
>> - datasize = _end - _etext;
>> - initsize = __init_end - __init_begin;
>> -
>> - pr_info("Memory Available: %dM / %ldM (%dK code, %dK data, %dK init,
>> %dK reserv)\n",
>> - PAGES_TO_MB(free_pages),
>> - TO_MB(arc_mem_sz),
>> - TO_KB(codesize), TO_KB(datasize), TO_KB(initsize),
>> - PAGES_TO_KB(reserved_pages));
>> + mem_init_print_info(NULL);
>> }
>>
>> /*
>>
>
> The Changes look OK though. I managed to build your github tree (mem_init_v5
> branch). And it seems to work ok.
>
> Acked-by: Vineet Gupta <[email protected]> # for arch/arc
Thanks for review and tests!
Regards!
Gerry
>
> Thx
> -Vineet
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
