summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-15 09:56:08 -0800
committerrichard <none@none>2010-01-15 09:56:08 -0800
commit4fab3145311da62501b927edafde80c8cf6eb250 (patch)
tree6b5baa63b77cf63340e33580ae41ae0934a86744
parent6d8081cebf629c31efce4d5eb71360c1bd259721 (diff)
parentd27833382868b76673f9dbe744c01d92704f21b0 (diff)
merge
-rw-r--r--indra/llcommon/llfasttimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 5058a2e772..85c78198dc 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -77,7 +77,7 @@ inline U32 get_cpu_clock_count_64()
{
U64 x;
__asm__ volatile (".byte 0x0f, 0x31": "=A"(x));
- return x >> 8;
+ return x;
}
#endif