On Thu, Dec 7, 2017 at 7:08 AM, Christoph Hellwig <hch@xxxxxx> wrote: > From: Logan Gunthorpe <logang@xxxxxxxxxxxx> > > This new interface is similar to how struct device (and many others) > work. The caller initializes a 'struct dev_pagemap' as required > and calls 'devm_memremap_pages'. This allows the pagemap structure to > be embedded in another structure and thus container_of can be used. In > this way application specific members can be stored in a containing > struct. > > This will be used by the P2P infrastructure and HMM could probably > be cleaned up to use it as well (instead of having it's own, similar > 'hmm_devmem_pages_create' function). > > Signed-off-by: Logan Gunthorpe <logang@xxxxxxxxxxxx> > Signed-off-by: Christoph Hellwig <hch@xxxxxx> [..] > diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c > index e1f75a1914a1..9631993b6ee0 100644 > --- a/tools/testing/nvdimm/test/iomap.c > +++ b/tools/testing/nvdimm/test/iomap.c > @@ -104,15 +104,14 @@ void *__wrap_devm_memremap(struct device *dev, resource_size_t offset, > } > EXPORT_SYMBOL(__wrap_devm_memremap); > > -void *__wrap_devm_memremap_pages(struct device *dev, struct resource *res, > - struct percpu_ref *ref, struct vmem_altmap *altmap) > +void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) > { > - resource_size_t offset = res->start; > + resource_size_t offset = pgmap->res.start; > struct nfit_test_resource *nfit_res = get_nfit_res(offset); > > if (nfit_res) > return nfit_res->buf + offset - nfit_res->res.start; > - return devm_memremap_pages(dev, res, ref, altmap); > + return devm_memremap_pages(dev, pgmap) Missed semicolon... I need to follow up with the kbuild robot about including tools/testing/nvdimm in its build tests. -- 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>