Conflicts:
fio.c
fio.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
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;
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",