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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64 
+/** @addtogroup sparc64
  * @{
  */
@@ -40 +40 @@
 
 /* mask of the "counter" field of the Tick register */
-#define TICK_COUNTER_MASK       (~(1l << 63))
+#define TICK_COUNTER_MASK  (~(1l << 63))
 
 extern void tick_init(void);
-extern void tick_interrupt(int n, istate_t *istate);
+extern void tick_interrupt(unsigned int, istate_t *);
 
 /**