| commit | 61b29c20eb4b1d374636d5325fb56c0fa9a574ad | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Thu Apr 05 08:58:31 2012 -0600 |
| committer | Jens Axboe <axboe@kernel.dk> | Thu Apr 05 08:58:31 2012 -0600 |
| tree | 415e0ee0e6cd28e7c5d8d8bace91ad213678704a | |
| parent | b0df7176176935b4d39fd196ad35f046bbe10333 [diff] [blame] | |
| parent | c857cfebb50209b950cbc88b4f74714fdf5be75f [diff] [blame] |
Merge branch 'master' into gfio Conflicts: fio.c fio.h Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/libfio.c b/libfio.c index acdb0ea..36876dd 100644 --- a/libfio.c +++ b/libfio.c
@@ -41,8 +41,8 @@ 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",