diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:32 +0000 |
| commit | 78157f5f8cde58d3c552ad6f0ad65118a92e3529 (patch) | |
| tree | 02476bdee08159c29579a99252f7b85a2275e60c /block | |
| parent | c4a3c95bcca5d9997e73c581b8cf6fb9adf8434c (diff) | |
| parent | 16c29dd8dd14a722836ca31440486feb2d730e29 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 4e595ee8c915..749afadfbb33 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -399,9 +399,9 @@ static inline uint64_t blkg_stat_read(struct blkg_stat *stat) uint64_t v; do { - start = u64_stats_fetch_begin(&stat->syncp); + start = u64_stats_fetch_begin_bh(&stat->syncp); v = stat->cnt; - } while (u64_stats_fetch_retry(&stat->syncp, start)); + } while (u64_stats_fetch_retry_bh(&stat->syncp, start)); return v; } @@ -467,9 +467,9 @@ static inline struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat) struct blkg_rwstat tmp; do { - start = u64_stats_fetch_begin(&rwstat->syncp); + start = u64_stats_fetch_begin_bh(&rwstat->syncp); tmp = *rwstat; - } while (u64_stats_fetch_retry(&rwstat->syncp, start)); + } while (u64_stats_fetch_retry_bh(&rwstat->syncp, start)); return tmp; } |