rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 494d228a91dd2bbfb7e1f02a45e5250a5bf1af92..2fdb4a451b49bd626d9415b231c76b7ac927cf69 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1187,9 +1187,10 @@ static inline int queue_alignment_offset(struct request_queue *q)
 static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
 {
        unsigned int granularity = max(lim->physical_block_size, lim->io_min);
-       unsigned int alignment = sector_div(sector, granularity >> 9) << 9;
+       unsigned int alignment = (sector << 9) & (granularity - 1);
 
-       return (granularity + lim->alignment_offset - alignment) % granularity;
+       return (granularity + lim->alignment_offset - alignment)
+               & (granularity - 1);
 }
 
 static inline int bdev_alignment_offset(struct block_device *bdev)