diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-01-15 13:27:25 -0800 |
| commit | 7590704e0e93b48f897c47dba07916efebd95274 (patch) | |
| tree | e38f863dc5a72bc078d362a9fee214e018d0ca05 /indra/llcommon | |
| parent | 940e070326e920b6314c7153f687d9985ad763ed (diff) | |
| parent | 7efc0fbb4fd912d59a38a4d5653f1dc12c3876b1 (diff) | |
Merge with Tip
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 |