Merge https://github.com/TeamButter/android_kernel_motorola_msm8952 into o8.1o8.0

1 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index ca31306f7b5..8236ef859a9 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -297,6 +297,18 @@ sb_bread(struct super_block *sb, sector_t block)
 	return __bread(sb->s_bdev, block, sb->s_blocksize);
 }
 
+static inline struct buffer_head *
+sb_bread_unmovable(struct super_block *sb, sector_t block)
+{
+	return sb_bread(sb, block);
+}
+
+static inline struct buffer_head *getblk_unmovable(struct block_device *bdev,
+					sector_t block, unsigned size)
+{
+	return __getblk(bdev, block, size);
+}
+
 static inline void
 sb_breadahead(struct super_block *sb, sector_t block)
 {