Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
emmc test: fix counter overflow
64bit emmc fix
Change-Id: I9505f278f80aa1dde754c85a0977255376060cba
diff --git a/tests/ext4/rand_emmc_perf.c b/tests/ext4/rand_emmc_perf.c
index ed6a05c..ebd10c8 100644
--- a/tests/ext4/rand_emmc_perf.c
+++ b/tests/ext4/rand_emmc_perf.c
@@ -147,7 +147,7 @@
{
struct timeval start, end, res;
char buf[TST_BLK_SIZE] = { 0 };
- int iops = 0;
+ long long iops = 0;
int msecs;
res.tv_sec = 0;
@@ -177,7 +177,7 @@
timersub(&end, &start, &res);
msecs = (res.tv_sec * 1000) + (res.tv_usec / 1000);
- printf("%d %dbyte iops/sec\n", iops * 1000 / msecs, TST_BLK_SIZE);
+ printf("%.0f %dbyte iops/sec\n", (float)iops * 1000 / msecs, TST_BLK_SIZE);
}
int main(int argc, char *argv[])