Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 5 Apr 2012 14:58:31 +0000 (08:58 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 Apr 2012 14:58:31 +0000 (08:58 -0600)
Conflicts:
fio.c
fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
HOWTO
fio.h
iolog.c
libfio.c
stat.c

diff --cc HOWTO
Simple merge
diff --cc fio.h
--- 1/fio.h
--- 2/fio.h
+++ b/fio.h
@@@ -314,7 -527,8 +314,7 @@@ extern int shm_id
  extern int groupid;
  extern int terse_output;
  extern int temp_stall_ts;
- extern unsigned long page_mask, page_size;
 -extern unsigned long long mlock_size;
+ extern uintptr_t page_mask, page_size;
  extern int read_only;
  extern int eta_print;
  extern unsigned long done_secs;
diff --cc iolog.c
Simple merge
diff --cc libfio.c
+++ b/libfio.c
@@@ -41,9 -36,6 +41,9 @@@ 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",
        "Linux",
diff --cc stat.c
Simple merge