aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/nvdimm/pmem-dax.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-06-03 18:06:47 -0700
committerDan Williams <dan.j.williams@intel.com>2016-07-12 19:25:38 -0700
commit7a9eb20666317794d0279843fbd091af93907780 (patch)
tree022accc57a56ee2988f29fe718546b0f1ec5dca0 /tools/testing/nvdimm/pmem-dax.c
parentpmem: kill wmb_pmem() (diff)
downloadlinux-dev-7a9eb20666317794d0279843fbd091af93907780.tar.xz
linux-dev-7a9eb20666317794d0279843fbd091af93907780.zip
pmem: kill __pmem address space
The __pmem address space was meant to annotate codepaths that touch persistent memory and need to coordinate a call to wmb_pmem(). Now that wmb_pmem() is gone, there is little need to keep this annotation. Cc: Christoph Hellwig <hch@lst.de> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'tools/testing/nvdimm/pmem-dax.c')
-rw-r--r--tools/testing/nvdimm/pmem-dax.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/nvdimm/pmem-dax.c b/tools/testing/nvdimm/pmem-dax.c
index 1e0218ce6a8b..c9b8c48f85fc 100644
--- a/tools/testing/nvdimm/pmem-dax.c
+++ b/tools/testing/nvdimm/pmem-dax.c
@@ -16,7 +16,7 @@
#include <nd.h>
long pmem_direct_access(struct block_device *bdev, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size)
+ void **kaddr, pfn_t *pfn, long size)
{
struct pmem_device *pmem = bdev->bd_queue->queuedata;
resource_size_t offset = sector * 512 + pmem->data_offset;