From 4f4e66cc682037183fdf42fa3cdfff26f576a60d Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 16 Apr 2012 13:57:22 -0700
Subject: [PATCH] --- yaml --- r: 309271 b: refs/heads/master c:
 c94bed89995e638e43a6663177358b9d20617361 h: refs/heads/master i:   309269:
 38e00127392471aaf70c42ec5608ba2c06506a2f   309267:
 771febe66b40c59357cab6175cb402cd6fc42536   309263:
 2918dcac7d40f36ed7bb1bc7d51ca61cecb1a657 v: v3

---
 [refs]                   | 2 +-
 trunk/block/blk-cgroup.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd31d0e22326..5beeeb46029b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d18b008daf46bcd82b8ae250aae0785f9714096
+refs/heads/master: c94bed89995e638e43a6663177358b9d20617361
diff --git a/trunk/block/blk-cgroup.h b/trunk/block/blk-cgroup.h
index 222063d36355..ef6550a67a69 100644
--- a/trunk/block/blk-cgroup.h
+++ b/trunk/block/blk-cgroup.h
@@ -279,7 +279,7 @@ static inline void blkg_rwstat_add(struct blkg_rwstat *rwstat,
  * This function can be called without synchronization and takes care of
  * u64 atomicity.
  */
-static struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat)
+static inline struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat)
 {
 	unsigned int start;
 	struct blkg_rwstat tmp;