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;