Changeset 09b859c in mainline for kernel/arch/sparc64/include/cycle.h

Timestamp:

2010-07-07T18:37:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

77385fe

Parents:

e2ea4ab1 (diff), 22c3444 (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 from mainline.

File:

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

kernel/arch/sparc64/include/cycle.h

@@ -36 +36 @@
 #define KERN_sparc64_CYCLE_H_
 
-#include <arch/asm.h> 
+#include <arch/asm.h>
+#include <trace.h>
 
-static inline uint64_t get_cycle(void)
+NO_TRACE static inline uint64_t get_cycle(void)
 {
         return tick_read();