Merge branches 'pm-cpufreq-sched' and 'intel_pstate'

[sfrench/cifs-2.6.git] / include / linux / buffer_head.h

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index e0abeba3ced75aca77b7cc5ac3ab00668678d3a8..c8dae555eccf9f30e50213eef55d2e6bee648d06 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -202,6 +202,8 @@ void write_boundary_block(struct block_device *bdev,
                        sector_t bblock, unsigned blocksize);
 int bh_uptodate_or_lock(struct buffer_head *bh);
 int bh_submit_read(struct buffer_head *bh);
+loff_t page_cache_seek_hole_data(struct inode *inode, loff_t offset,
+                                loff_t length, int whence);
 
 extern int buffer_heads_over_limit;