summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer.h
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-15 11:25:10 -0800
committerrichard <none@none>2010-01-15 11:25:10 -0800
commitc9cf84913d306103da51dc83e5932ff3fb308d32 (patch)
tree9ecb21f9376f29264db9fce33310ffa3a66fc8ab /indra/llcommon/llfasttimer.h
parentaaef23d7eb1c17ea744fe5737af91b1ed228d416 (diff)
parent1d1f51db971271c42d68fa12032d6f85a7e35bd8 (diff)
merge
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
-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