projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream-fixes
[powerpc.git]
/
drivers
/
s390
/
cio
/
cmf.c
diff --git
a/drivers/s390/cio/cmf.c
b/drivers/s390/cio/cmf.c
index
0df3af1
..
828b2d3
100644
(file)
--- a/
drivers/s390/cio/cmf.c
+++ b/
drivers/s390/cio/cmf.c
@@
-1068,6
+1068,7
@@
cmb_show_avg_sample_interval(struct device *dev, struct device_attribute *attr,
if (count) {
interval = cmb_data->last_update -
cdev->private->cmb_start_time;
+ interval = (interval * 1000) >> 12;
interval /= count;
} else
interval = -1;