Merge branch 'master' into gfio

[fio.git] / libfio.c

diff --git a/libfio.c b/libfio.c
index 95938c88da4e12e4b3eb8adc9b33e74438be340e..36876ddf24dc66c25f9b778fc4141acb122e433f 100644 (file)
--- a/libfio.c
+++ b/libfio.c
@@ -41,8 +41,8 @@ FLIST_HEAD(disk_list);
 
 unsigned long arch_flags = 0;
 
-unsigned long page_mask;
-unsigned long page_size;
+uintptr_t page_mask;
+uintptr_t page_size;
 
 static const char *fio_os_strings[os_nr] = {
        "Invalid",
@@ -133,8 +133,6 @@ void reset_fio_state(void)
 {
        groupid = 0;
        thread_number = 0;
-       nr_process = 0;
-       nr_thread = 0;
        done_secs = 0;
 }