Merge tag 'wireless-drivers-for-davem-2017-01-29' of git://git.kernel.org/pub/scm...

[mirror_ubuntu-artful-kernel.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index ddcddfeaa03bd942e83738d34c4abaed06fa2709..3af2da5e64ce77fa8ae4b3f294c82882d350120f 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -990,7 +990,6 @@ int __dax_zero_page_range(struct block_device *bdev, sector_t sector,
 }
 EXPORT_SYMBOL_GPL(__dax_zero_page_range);
 
-#ifdef CONFIG_FS_IOMAP
 static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)
 {
        return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);
@@ -1428,4 +1427,3 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address,
 }
 EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault);
 #endif /* CONFIG_FS_DAX_PMD */
-#endif /* CONFIG_FS_IOMAP */