Changeset 16f9782 in mainline for kernel/arch/ia32/include/cycle.h

Timestamp:

2011-08-19T16:46:22Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab34cc9

Parents:

633bcc6 (diff), 45059d6b (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 mainline changes.

File:

• kernel/arch/ia32/include/cycle.h (modified) (2 diffs)

kernel/arch/ia32/include/cycle.h

@@ -40 +40 @@
 NO_TRACE static inline uint64_t get_cycle(void)
 {
+#ifdef PROCESSOR_i486
+        return 0;
+#else
         uint64_t v;
         
@@ -48 +51 @@
         
         return v;
+#endif
 }