Merge branch 'arm-detect-pmull' of https://github.com/sitsofe/fio

* 'arm-detect-pmull' of https://github.com/sitsofe/fio:
  os: detect PMULL support before enabling accelerated crc32c on ARM

diff --git a/io_ddir.h b/io_ddir.h
index a42da97a335cd046b82c44c396695be471341b8e..296a9d04ac53cc1c44585ee736f8ea424375615d 100644 (file)
--- a/io_ddir.h
+++ b/io_ddir.h
@@ -24,7 +24,7 @@ static inline const char *io_ddir_name(enum fio_ddir ddir)
                                        "datasync", "sync_file_range",
                                        "wait", };
 
-       if (ddir < DDIR_LAST)
+       if (ddir >= 0 && ddir < DDIR_LAST)
                return name[ddir];
 
        return "invalid";

diff --git a/libfio.c b/libfio.c
index ed5906d4c2d3d80d70ca5f806662c216224e8544..198eaf2eb723f744cbc279cd3dff51a1be64bd00 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -140,7 +140,6 @@ void reset_all_stats(struct thread_data *td)
                td->io_issues[i] = 0;
                td->ts.total_io_u[i] = 0;
                td->ts.runtime[i] = 0;
-               td->rwmix_issues = 0;
        }
 
        set_epoch_time(td, td->o.log_unix_epoch);