Merge branch 'for-4.12/dax' into libnvdimm-for-next

This commit is contained in:
Dan Williams 2017-05-04 23:38:43 -07:00
commit 736163671b
110 changed files with 4759 additions and 2054 deletions

View file

@ -1849,8 +1849,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *nfit_blk,
mmio_flush_range((void __force *)
mmio->addr.aperture + offset, c);
memcpy_from_pmem(iobuf + copied,
mmio->addr.aperture + offset, c);
memcpy(iobuf + copied, mmio->addr.aperture + offset, c);
}
copied += c;