From: Akash Verma <akashv@google.com>
Date: Thu, 19 Mar 2015 23:19:25 +0000 (-0700)
Subject: Cpu clock does not wrap if there is no CPU clock
X-Git-Tag: fio-2.2.7~13
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=dac499a01d1958781e526df982d78d733f19c527

Cpu clock does not wrap if there is no CPU clock

This causes compiler warnings because of unused variables cycles_start
and cycles_wrap.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/gettime.c b/gettime.c
index d1c8eb97..180aa5f2 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 {