Merge branch 'master' into gfio
Conflicts:
Makefile
fio.h
io_u.c
ioengine.h
memory.c
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/thread_options.h b/thread_options.h
index 9975af1..5354473 100644
--- a/thread_options.h
+++ b/thread_options.h
@@ -123,6 +123,8 @@
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
+ unsigned int random_generator;
+
unsigned int hugepage_size;
unsigned int rw_min_bs;
unsigned int thinktime;
@@ -326,6 +328,8 @@
fio_fp64_t zipf_theta;
fio_fp64_t pareto_h;
+ uint32_t random_generator;
+
uint32_t hugepage_size;
uint32_t rw_min_bs;
uint32_t thinktime;