Changeset 0b9ac3c in mainline for kernel/arch/sparc64/include/drivers/tick.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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/sparc64/include/drivers/tick.h (modified) (1 diff)

kernel/arch/sparc64/include/drivers/tick.h

@@ -36 +36 @@
 #define KERN_sparc64_TICK_H_
 
+#include <arch/asm.h>
 #include <arch/interrupt.h>
+
+/* mask of the "counter" field of the Tick register */
+#define TICK_COUNTER_MASK       (~(1l << 63))
 
 extern void tick_init(void);
 extern void tick_interrupt(int n, istate_t *istate);
+
+/**
+ * Reads the Tick register counter.
+ */
+static inline uint64_t tick_counter_read(void)
+{
+        return TICK_COUNTER_MASK & tick_read();
+}
 
 #endif