From: Jens Axboe <axboe@fb.com>
Date: Wed, 17 Dec 2014 16:08:01 +0000 (-0700)
Subject: gettime: fix compile warning for !ARCH_HAVE_CPU_CLOCK
X-Git-Tag: fio-2.2.0~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=03be65c96360db94cde247bd46f523dfe5e61d12;p=fio.git

gettime: fix compile warning for !ARCH_HAVE_CPU_CLOCK

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

diff --git a/gettime.c b/gettime.c
index a95b5452..172b4782 100644
--- a/gettime.c
+++ b/gettime.c
@@ -26,11 +26,13 @@ struct tv_valid {
 	int last_tv_valid;
 	int warned;
 };
+#ifdef ARCH_HAVE_CPU_CLOCK
 #ifdef CONFIG_TLS_THREAD
 static __thread struct tv_valid static_tv_valid;
 #else
 static pthread_key_t tv_tls_key;
 #endif
+#endif
 
 enum fio_cs fio_clock_source = FIO_PREFERRED_CLOCK_SOURCE;
 int fio_clock_source_set = 0;
@@ -137,14 +139,6 @@ static int fill_clock_gettime(struct timespec *ts)
 
 static void __fio_gettime(struct timeval *tp)
 {
-	struct tv_valid *tv;
-
-#ifdef CONFIG_TLS_THREAD
-	tv = &static_tv_valid;
-#else
-	tv = pthread_getspecific(tv_tls_key);
-#endif
-
 	switch (fio_clock_source) {
 #ifdef CONFIG_GETTIMEOFDAY
 	case CS_GTOD:
@@ -168,15 +162,20 @@ static void __fio_gettime(struct timeval *tp)
 #ifdef ARCH_HAVE_CPU_CLOCK
 	case CS_CPUCLOCK: {
 		uint64_t usecs, t;
+		struct tv_valid *tv;
+
+#ifdef CONFIG_TLS_THREAD
+		tv = &static_tv_valid;
+#else
+		tv = pthread_getspecific(tv_tls_key);
+#endif
 
 		t = get_cpu_clock();
 		if (t < cycles_start && !cycles_wrap)
 			cycles_wrap = 1;
-		else if (cycles_wrap && t >= cycles_start) {
-			if (!tv->warned) {
-				log_err("fio: double CPU clock wrap\n");
-				tv->warned = 1;
-			}
+		else if (cycles_wrap && t >= cycles_start && !tv->warned) {
+			log_err("fio: double CPU clock wrap\n");
+			tv->warned = 1;
 		}
 
 		t -= cycles_start;