Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 6fb1bda0d0b61e2433f9ef34b4b979b2642d8706:

  io_u_queue: add debug assert check on adding too many elements (2015-03-19 22:25:35 -0600)

are available in the git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to dac499a01d1958781e526df982d78d733f19c527:

  Cpu clock does not wrap if there is no CPU clock (2015-03-20 10:29:29 -0600)

----------------------------------------------------------------
Akash Verma (1):
      Cpu clock does not wrap if there is no CPU clock

 gettime.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

---

Diff of recent changes:

diff --git a/gettime.c b/gettime.c
index d1c8eb9..180aa5f 100644
--- a/gettime.c
+++ b/gettime.c
@@ -13,7 +13,8 @@
 #include "hash.h"
 #include "os/os.h"
 
-#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
+#if defined(ARCH_HAVE_CPU_CLOCK)
+#ifndef ARCH_CPU_CLOCK_CYCLES_PER_USEC
 static unsigned long cycles_per_usec;
 static unsigned long inv_cycles_per_usec;
 static uint64_t max_cycles_for_mult;
@@ -21,6 +22,7 @@ static uint64_t max_cycles_for_mult;
 #ifdef ARCH_CPU_CLOCK_WRAPS
 static unsigned long long cycles_start, cycles_wrap;
 #endif
+#endif
 int tsc_reliable = 0;
 
 struct tv_valid {