X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Fblock_dev.c;h=22ea424ee741ea1a967676298e7877332fc324b2;hb=06ab838c2024db468855118087db16d8fa905ddc;hp=33b813e04f7921e390c9f4edec0908d4fcb9337f;hpb=1c8cc72d57f321bfccadf4f7b38b94ba287928bc;p=deliverable%2Flinux.git

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 33b813e04f79..22ea424ee741 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -28,6 +28,7 @@
 #include <linux/namei.h>
 #include <linux/log2.h>
 #include <linux/cleancache.h>
+#include <linux/dax.h>
 #include <asm/uaccess.h>
 #include "internal.h"
 
@@ -441,7 +442,7 @@ EXPORT_SYMBOL_GPL(bdev_write_page);
  * accessible at this address.
  */
 long bdev_direct_access(struct block_device *bdev, sector_t sector,
-			void **addr, unsigned long *pfn, long size)
+			void __pmem **addr, unsigned long *pfn, long size)
 {
 	long avail;
 	const struct block_device_operations *ops = bdev->bd_disk->fops;
@@ -462,7 +463,7 @@ long bdev_direct_access(struct block_device *bdev, sector_t sector,
 	sector += get_start_sect(bdev);
 	if (sector % (PAGE_SIZE / 512))
 		return -EINVAL;
-	avail = ops->direct_access(bdev, sector, addr, pfn, size);
+	avail = ops->direct_access(bdev, sector, addr, pfn);
 	if (!avail)
 		return -ERANGE;
 	return min(avail, size);