X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust%2Fclock.h;h=22d2efc65c9666905ff896d0fac4c89a8bbd2462;hb=1c330d13895139a60bb47a0efba1f50af080cf59;hp=ac0a2d5a9e1453460f4225f968d0496d059c3633;hpb=9c6bb08180ab0a65bbf3d47247a9d36e257fa44a;p=ust.git

diff --git a/include/ust/clock.h b/include/ust/clock.h
index ac0a2d5..22d2efc 100644
--- a/include/ust/clock.h
+++ b/include/ust/clock.h
@@ -39,7 +39,6 @@
    precision and monotonicity.
 */
 
-#if __i386__ || __x86_64__
 /* Only available for x86 arch */
 #define CLOCK_TRACE_FREQ  14
 #define CLOCK_TRACE  15
@@ -47,36 +46,10 @@ union lttng_timespec {
 	struct timespec ts;
 	u64 lttng_ts;
 };
-#endif /* __i386__ || __x86_64__ */
 
-static int ust_clock_source;
+extern int ust_clock_source;
 
 /* Choosing correct trace clock */
-#if __PPC__
-static __inline__ u64 trace_clock_read64(void)
-{
-	unsigned long tb_l;
-	unsigned long tb_h;
-	unsigned long tb_h2;
-	u64 tb;
-
-	__asm__ (
-		"1:\n\t"
-		"mftbu %[rhigh]\n\t"
-		"mftb %[rlow]\n\t"
-		"mftbu %[rhigh2]\n\t"
-		"cmpw %[rhigh],%[rhigh2]\n\t"
-		"bne 1b\n\t"
-		: [rhigh] "=r" (tb_h), [rhigh2] "=r" (tb_h2), [rlow] "=r" (tb_l));
-
-	tb = tb_h;
-	tb <<= 32;
-	tb |= tb_l;
-
-	return tb;
-}
-
-#else	/* !__PPC__ */
 
 static __inline__ u64 trace_clock_read64(void)
 {
@@ -101,8 +74,7 @@ static __inline__ u64 trace_clock_read64(void)
 	return retval;
 }
 
-#endif /* __PPC__ */
-
+#if __i386__ || __x86_64__
 static __inline__ u64 trace_clock_frequency(void)
 {
 	struct timespec ts;
@@ -114,6 +86,12 @@ static __inline__ u64 trace_clock_frequency(void)
 	}
 	return 1000000000LL;
 }
+#else /* #if __i386__ || __x86_64__ */
+static __inline__ u64 trace_clock_frequency(void)
+{
+	return 1000000000LL;
+}
+#endif /* #else #if __i386__ || __x86_64__ */
 
 static __inline__ u32 trace_clock_freq_scale(void)
 {