From: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
Date: Wed, 7 Jun 2017 08:39:39 +0000 (+0100)
Subject: fix-cycles-arch
X-Git-Tag: archive/raspbian/12.2.8+dfsg1-5+rpi1~3^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=697cbac776afd42f8ed70d62842f99bc5cd09801;p=ceph.git

fix-cycles-arch


Gbp-Pq: Name fix-cycles-arch.patch
---

diff --git a/src/common/Cycles.cc b/src/common/Cycles.cc
index 656f08b40..4d04eed9e 100644
--- a/src/common/Cycles.cc
+++ b/src/common/Cycles.cc
@@ -57,6 +57,10 @@ void Cycles::init()
   if (rdtsc() == 0)
     return;
 
+  // Skip initialization if rtdsc is not implemented
+  if (rdtsc() == 0)
+    return;
+
   // Compute the frequency of the fine-grained CPU timer: to do this,
   // take parallel time readings using both rdtsc and gettimeofday.
   // After 10ms have elapsed, take the ratio between these readings.