Changeset c621f4aa in mainline for kernel/arch/amd64/include/cycle.h

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• kernel/arch/amd64/include/cycle.h (modified) (1 diff)

kernel/arch/amd64/include/cycle.h

@@ -36 +36 @@
 #define KERN_amd64_CYCLE_H_
 
-extern uint64_t get_cycle(void);
+#include <trace.h>
+
+NO_TRACE static inline uint64_t get_cycle(void)
+{
+        uint32_t lower;
+        uint32_t upper;
+        
+        asm volatile (
+                "rdtsc\n"
+                : "=a" (lower),
+                  "=d" (upper)
+        );
+        
+        return ((uint64_t) lower) | (((uint64_t) upper) << 32);
+}
 
 #endif