X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fclock.h;h=23294d2b8c2fdf771d043e775b83664ab3d19549;hb=79dfbf429c229ef733c5d8691a681edb91bee871;hp=3de1fa81ec0a7704bafcd2aa55e44673ffd1d466;hpb=b728d87e617189fe9898a9492a559ecf949d2348;p=lttng-ust.git

diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
index 3de1fa81..23294d2b 100644
--- a/liblttng-ust/clock.h
+++ b/liblttng-ust/clock.h
@@ -24,7 +24,6 @@
 #include <sys/time.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <lttng/core.h>
 
 /* TRACE CLOCK */
 
@@ -40,16 +39,9 @@ static __inline__ uint64_t trace_clock_read64(void)
 	struct timespec ts;
 
 	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return (ts.tv_sec * 1000000000) + ts.tv_nsec;
+	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }
 
-#if __i386__ || __x86_64__
-static __inline__ uint64_t trace_clock_frequency(void)
-{
-	return 1000000000LL;
-}
-#endif /* #else #if __i386__ || __x86_64__ */
-
 static __inline__ uint32_t trace_clock_freq_scale(void)
 {
 	return 1;