diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-06-03 18:06:47 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-12 19:25:38 -0700 |
| commit | 7a9eb20666317794d0279843fbd091af93907780 (patch) | |
| tree | 022accc57a56ee2988f29fe718546b0f1ec5dca0 /include/linux/blkdev.h | |
| parent | 7c8a6a71904d57ae5fb24140f9661ec22ca9ee85 (diff) | |
| download | linux-7a9eb20666317794d0279843fbd091af93907780.tar.gz linux-7a9eb20666317794d0279843fbd091af93907780.tar.bz2 linux-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 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3d9cf326574f..fde908b2836b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1659,7 +1659,7 @@ static inline bool integrity_req_gap_front_merge(struct request *req, */ struct blk_dax_ctl { sector_t sector; - void __pmem *addr; + void *addr; long size; pfn_t pfn; }; @@ -1670,8 +1670,8 @@ struct block_device_operations { int (*rw_page)(struct block_device *, sector_t, struct page *, int rw); int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); - long (*direct_access)(struct block_device *, sector_t, void __pmem **, - pfn_t *, long); + long (*direct_access)(struct block_device *, sector_t, void **, pfn_t *, + long); unsigned int (*check_events) (struct gendisk *disk, unsigned int clearing); /* ->media_changed() is DEPRECATED, use ->check_events() instead */ |