On Fri, Dec 15, 2017 at 6:09 AM, Christoph Hellwig <hch@xxxxxx> wrote: > We can just pass this on instead of having to do a radix tree lookup > without proper locking 2 levels into the callchain. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> [..] > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 8acdc35c2dfa..e26ade50ae18 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -772,12 +772,12 @@ static void update_end_of_memory_vars(u64 start, u64 size) > } > } > > -int add_pages(int nid, unsigned long start_pfn, > - unsigned long nr_pages, bool want_memblock) > +int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, > + struct vmem_altmap *altmap, bool want_memblock) > { > int ret; > > - ret = __add_pages(nid, start_pfn, nr_pages, want_memblock); > + ret = __add_pages(nid, start_pfn, nr_pages, NULL, want_memblock); > WARN_ON_ONCE(ret); Should be 'altmap' instead of NULL. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>