diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-07-03 16:54:58 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-07-03 16:54:58 -0700 |
| commit | 9d92573fff3ec70785ef1815cc80573f70e7a921 (patch) | |
| tree | bce6e6bbad56f805d1adcebddabf9dd9e8072ce4 /drivers/nvdimm/claim.c | |
| parent | 2de5148ffb12ff6b4088125f44818771e78e6830 (diff) | |
| parent | 0b277961f4484fb3f142caaa1dd1748cb0b2cbee (diff) | |
Merge branch 'for-4.13/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/claim.c')
| -rw-r--r-- | drivers/nvdimm/claim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index f8ad92b4dcd2..47770460f3d3 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -12,8 +12,8 @@ */ #include <linux/device.h> #include <linux/sizes.h> -#include <linux/pmem.h> #include "nd-core.h" +#include "pmem.h" #include "pfn.h" #include "btt.h" #include "nd.h" @@ -300,12 +300,12 @@ static int nsio_rw_bytes(struct nd_namespace_common *ndns, cleared /= 512; badblocks_clear(&nsio->bb, sector, cleared); } - invalidate_pmem(nsio->addr + offset, size); + arch_invalidate_pmem(nsio->addr + offset, size); } else rc = -EIO; } - memcpy_to_pmem(nsio->addr + offset, buf, size); + memcpy_flushcache(nsio->addr + offset, buf, size); nvdimm_flush(to_nd_region(ndns->dev.parent)); return rc; |