diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-04 00:30:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-04 00:30:46 +0100 |
| commit | 7d89516d246691c9a82e75563294df01b768f1d6 (patch) | |
| tree | c7f94630245e9afdb28a07361976cd80ac997a38 /block | |
| parent | 67a681c0333be267b80a509151a4553760069bb2 (diff) | |
| parent | 18d8ff256f495bee7bcf016d9006d4b330e29260 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'block')
| -rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index d5bbdcfd0dab..c410752c5c65 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1803,7 +1803,7 @@ static u64 cfqg_prfill_avg_queue_size(struct seq_file *sf, if (samples) { v = blkg_stat_read(&cfqg->stats.avg_queue_size_sum); - do_div(v, samples); + v = div64_u64(v, samples); } __blkg_prfill_u64(sf, pd, v); return 0; |