diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2017-05-04 23:38:43 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-05-04 23:38:43 -0700 |
| commit | 736163671bcb163fc82600b46c83dfa89d532d95 (patch) | |
| tree | 0639dc9d9fa180450b4e8fbda706eaae5f1876da /drivers/acpi | |
| parent | libnvdimm, pfn: fix 'npfns' vs section alignment (diff) | |
| parent | brd: fix uninitialized use of brd->dax_dev (diff) | |
| download | linux-dev-736163671bcb163fc82600b46c83dfa89d532d95.tar.xz linux-dev-736163671bcb163fc82600b46c83dfa89d532d95.zip | |
Merge branch 'for-4.12/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/nfit/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 891bd49ada0b..656acb5d7166 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -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; |