projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v3.10/topic/pinctrl' of git://git.linaro.org/kernel/linux-linaro-stable...
[firefly-linux-kernel-4.4.55.git]
/
block
/
blk-cgroup.h
diff --git
a/block/blk-cgroup.h
b/block/blk-cgroup.h
index 4e595ee8c9151aea5c0005bffbe1d936c4603083..749afadfbb3310bf5a4c45d1d8edb42370b6bd39 100644
(file)
--- 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 {
uint64_t v;
do {
- start = u64_stats_fetch_begin(&stat->syncp);
+ start = u64_stats_fetch_begin
_bh
(&stat->syncp);
v = stat->cnt;
v = stat->cnt;
- } while (u64_stats_fetch_retry(&stat->syncp, start));
+ } while (u64_stats_fetch_retry
_bh
(&stat->syncp, start));
return v;
}
return v;
}
@@
-467,9
+467,9
@@
static inline struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat)
struct blkg_rwstat tmp;
do {
struct blkg_rwstat tmp;
do {
- start = u64_stats_fetch_begin(&rwstat->syncp);
+ start = u64_stats_fetch_begin
_bh
(&rwstat->syncp);
tmp = *rwstat;
tmp = *rwstat;
- } while (u64_stats_fetch_retry(&rwstat->syncp, start));
+ } while (u64_stats_fetch_retry
_bh
(&rwstat->syncp, start));
return tmp;
}
return tmp;
}