[PATCHv4] mm: Don't offset memmap for flatmem

[laura@labbott.name (Laura Abbott)]

On 11/9/15 3:20 PM, Tony Luck wrote:
>> @@ -4984,9 +4987,9 @@ static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat)
>>           */
>>          if (pgdat == NODE_DATA(0)) {
>>                  mem_map = NODE_DATA(0)->node_mem_map;
>> -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
>> +#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
>>                  if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
>> -                       mem_map -= (pgdat->node_start_pfn - ARCH_PFN_OFFSET);
>> +                       mem_map -= offset;
>>   #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
>>          }
>>   #endif
>
> This piece breaks ia64.  See the comment earlier in the function
> that "ia64 gets its own node_mem_map" ... so we skip the initialization
> of offset ... and arrive down here and just subtract "0" from mem_map.
>
> Attached patch fixes ia64 ... does ARM still work if this is applied?
>
> -Tony
>

Yes, this still fixes the problem for me. I see the pfn <-> page
translation working as expected.

Tested-by: Laura Abbott <laura@labbott.name>

Thanks,
Laura