From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 1 Jan 2013 09:59:04 +0000 (+0100)
Subject: Move 'tsc_reliable' outside of ARCH_HAVE_CPU_CLOCK
X-Git-Tag: fio-2.0.13~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4de98eb0e68314ba36fcfc2722a1c9b3bc5d3318;p=fio.git

Move 'tsc_reliable' outside of ARCH_HAVE_CPU_CLOCK

Otherwise we fail building on architectures that do not define
it, as reported by Dan:

cc -o gettime.o -c -std=gnu99 -Wwrite-strings -Wall -O3 -g -O2 -g -pipe
-Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector
--param=ssp-buffer-size=4 -m31 -march=z9-109 -mtune=z10
-DFIO_VERSION='"fio-2.0.12.2"' -D_GNU_SOURCE -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG gettime.c
gettime.c: In function 'fio_clock_init':
gettime.c:317:6: error: 'tsc_reliable' undeclared (first use in this function)
gettime.c:317:6: note: each undeclared identifier is reported only once for each function it appears in
make: *** [gettime.o] Error 1

Reported-by: Dan Horák <dan@danny.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/gettime.c b/gettime.c
index df329f66..05625d1b 100644
--- a/gettime.c
+++ b/gettime.c
@@ -16,8 +16,8 @@
 #ifdef ARCH_HAVE_CPU_CLOCK
 static unsigned long cycles_per_usec;
 static unsigned long inv_cycles_per_usec;
-int tsc_reliable = 0;
 #endif
+int tsc_reliable = 0;
 
 struct tv_valid {
 	struct timeval last_tv;