Changeset c028b22 in mainline for kernel/arch/sparc64/src/drivers/tick.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/src/drivers/tick.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/tick.c

@@ -44 +44 @@
 #include <debug.h>
 
-#define TICK_RESTART_TIME       50      /* Worst case estimate. */
-
 /** Initialize tick and stick interrupt. */
 void tick_init(void)
@@ -51 +49 @@
         /* initialize TICK interrupt */
         tick_compare_reg_t compare;
+        softint_reg_t clear;
 
         interrupt_register(14, "tick_int", tick_interrupt);
@@ -59 +58 @@
         tick_compare_write(compare.value);
 
+        clear.value = 0;
+        clear.tick_int = 1;
+        clear_softint_write(clear.value);
+
 #if defined (US3) || defined (SUN4V)
         /* disable STICK interrupts and clear any pending ones */
         tick_compare_reg_t stick_compare;
-        softint_reg_t clear;
 
         stick_compare.value = stick_compare_read();