Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

diff --combined Makefile
index f0f3ea0f00c03050cfb1435ecda14ef33e227f25,88d397b66b7f38bc9926023a7547f3c5c280c767..f59f809616e73b73a1d132f9e2fc318ab5b75347
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -15,7 -15,7 +15,7 @@@ SOURCE := gettime.c fio.c ioengines.c i
                lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \
                engines/mmap.c engines/sync.c engines/null.c engines/net.c \
                memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
-               json.c lib/zipf.c
+               json.c lib/zipf.c gettime-thread.c
  
  ifeq ($(UNAME), Linux)
    SOURCE += diskutil.c fifo.c blktrace.c helpers.c cgroup.c trim.c \
@@@ -69,15 -69,15 +69,15 @@@ endi
  OBJS = $(SOURCE:.c=.o)
  
  T_SMALLOC_OBJS = t/stest.o
- T_SMALLOC_OBJS += mutex.o smalloc.o t/log.o
+ T_SMALLOC_OBJS += gettime.o mutex.o smalloc.o t/log.o
  T_SMALLOC_PROGS = t/stest
  
  T_IEEE_OBJS = t/ieee754.o
- T_IEEE_OBJS += ieee754.o
+ T_IEEE_OBJS += lib/ieee754.o
  T_IEEE_PROGS = t/ieee754
  
  T_ZIPF_OBS = t/genzipf.o
 -T_ZIPF_OBJS += t/log.o lib/ieee754.o lib/rand.o lib/zipf.o t/genzipf.o
 +T_ZIPF_OBJS += rbtree.o t/log.o lib/ieee754.o lib/rand.o lib/zipf.o t/genzipf.o
  T_ZIPF_PROGS = t/genzip
  
  T_OBJS = $(T_SMALLOC_OBJS)