summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-15 10:15:57 -0800
committerrichard <none@none>2010-01-15 10:15:57 -0800
commit109b79e9ad67b5fa8967442a47ef15e456eb5bff (patch)
tree9e39fc97573cc89b0b3c08507d7f2fe0cc57d979 /indra/llcommon
parent5c09d482a47a8894ebebc9d3c8053b25a280f58e (diff)
parent4fab3145311da62501b927edafde80c8cf6eb250 (diff)
merge
Diffstat (limited to 'indra/llcommon')
-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