aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h6
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,
1659 */ 1659 */
1660struct blk_dax_ctl { 1660struct blk_dax_ctl {
1661 sector_t sector; 1661 sector_t sector;
1662 void __pmem *addr; 1662 void *addr;
1663 long size; 1663 long size;
1664 pfn_t pfn; 1664 pfn_t pfn;
1665}; 1665};
@@ -1670,8 +1670,8 @@ struct block_device_operations {
1670 int (*rw_page)(struct block_device *, sector_t, struct page *, int rw); 1670 int (*rw_page)(struct block_device *, sector_t, struct page *, int rw);
1671 int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); 1671 int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
1672 int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); 1672 int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
1673 long (*direct_access)(struct block_device *, sector_t, void __pmem **, 1673 long (*direct_access)(struct block_device *, sector_t, void **, pfn_t *,
1674 pfn_t *, long); 1674 long);
1675 unsigned int (*check_events) (struct gendisk *disk, 1675 unsigned int (*check_events) (struct gendisk *disk,
1676 unsigned int clearing); 1676 unsigned int clearing);
1677 /* ->media_changed() is DEPRECATED, use ->check_events() instead */ 1677 /* ->media_changed() is DEPRECATED, use ->check_events() instead */