diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-15 13:36:33 -0800 |
| commit | e761ba064a2b5960efdfc94bb5baef85a7ec1a0a (patch) | |
| tree | de9970a791adf551b9cfa65a0013118d33c77554 /indra/llcommon | |
| parent | 56af8f1639a13adeb6f34e9988489aa5757a3184 (diff) | |
| parent | 4c4c68a3408c85e49d365c31be93e006be612ab1 (diff) | |
Merge for EXT-1874, EXT-3800, EXT-4133
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 2 |
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 |