summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-11-24 08:05:08 -0700
committerJens Axboe <axboe@fb.com>2014-11-24 08:05:08 -0700
commitf74cd637b249dd96445e872813072401ef6e5fa6 (patch)
tree6e62523fd2cec32d893d85e75a5f2d242f7c25b5 /include
parentc78b47136f7adebcf953f541c7d9c4c745a54e3f (diff)
parent394ffa503bc40e32d7f54a9b817264e81ce131b4 (diff)
downloadlinux-f74cd637b249dd96445e872813072401ef6e5fa6.tar.gz
linux-f74cd637b249dd96445e872813072401ef6e5fa6.tar.bz2
linux-f74cd637b249dd96445e872813072401ef6e5fa6.zip
Merge branch 'for-3.19/core' into for-3.19/drivers
Diffstat (limited to 'include')
-rw-r--r--include/linux/bio.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 7347f486ceca..efead0b532c4 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -443,6 +443,11 @@ extern struct bio *bio_copy_kern(struct request_queue *, void *, unsigned int,
extern void bio_set_pages_dirty(struct bio *bio);
extern void bio_check_pages_dirty(struct bio *bio);
+void generic_start_io_acct(int rw, unsigned long sectors,
+ struct hd_struct *part);
+void generic_end_io_acct(int rw, struct hd_struct *part,
+ unsigned long start_time);
+
#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
# error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
#endif