diff options
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 c96db9c22d10..adf33079771e 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -1665,7 +1665,7 @@ static inline bool integrity_req_gap_front_merge(struct request *req, | |||
1665 | */ | 1665 | */ |
1666 | struct blk_dax_ctl { | 1666 | struct blk_dax_ctl { |
1667 | sector_t sector; | 1667 | sector_t sector; |
1668 | void __pmem *addr; | 1668 | void *addr; |
1669 | long size; | 1669 | long size; |
1670 | pfn_t pfn; | 1670 | pfn_t pfn; |
1671 | }; | 1671 | }; |
@@ -1676,8 +1676,8 @@ struct block_device_operations { | |||
1676 | int (*rw_page)(struct block_device *, sector_t, struct page *, int rw); | 1676 | int (*rw_page)(struct block_device *, sector_t, struct page *, int rw); |
1677 | int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 1677 | int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
1678 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 1678 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
1679 | long (*direct_access)(struct block_device *, sector_t, void __pmem **, | 1679 | long (*direct_access)(struct block_device *, sector_t, void **, pfn_t *, |
1680 | pfn_t *, long); | 1680 | long); |
1681 | unsigned int (*check_events) (struct gendisk *disk, | 1681 | unsigned int (*check_events) (struct gendisk *disk, |
1682 | unsigned int clearing); | 1682 | unsigned int clearing); |
1683 | /* ->media_changed() is DEPRECATED, use ->check_events() instead */ | 1683 | /* ->media_changed() is DEPRECATED, use ->check_events() instead */ |