diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:21 +0000 |
| commit | 16c29dd8dd14a722836ca31440486feb2d730e29 (patch) | |
| tree | 2f6b85ff48ddfe24c0f3688e4333695e18d469c7 /block | |
| parent | fae4bb16eec6425bd37495d8fa7d70bde98b368b (diff) | |
| parent | 05bcf8f867f4af11c93395d4a6dd1dd52d8904ea (diff) | |
Merge tag 'v3.10.24' into linux-linaro-lsk
This is the 3.10.24 stable release
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 4e595ee8c91..749afadfbb3 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; } |