Re: [PATCH -v2 3/6] x86, 64bit, numa: Put pgtable to local node memory

[Yinghai Lu]

On Wed, Dec 29, 2010 at 3:50 PM, H. Peter Anvin <hpa@xxxxxxxxx> wrote:
> On 12/29/2010 03:46 PM, Yinghai Lu wrote:
>>
>> -v2: update it to recent numa-emulation change
>>
>
> Lovely, yet another interbranch conflict.  This makes me very concerned.
>
> What is the delta between these?
>

your new x86/numa have

       setup_physnodes(addr, max_addr, acpi, amd);
       fake_physnodes(acpi, amd, num_nodes);

instead of

        acpi_fake_nodes(nodes, num_nodes);

in  numa_emulation()

Thanks

Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/