Changeset 6a44ee4 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/generic/src/time/clock.c (modified) (2 diffs)

kernel/generic/src/time/clock.c

@@ -94 +94 @@
         clock_parea.frames = 1;
         clock_parea.unpriv = true;
+        clock_parea.mapped = false;
         ddi_parea_register(&clock_parea);
         
@@ -163 +164 @@
                 
                 link_t *cur;
-                while ((cur = CPU->timeout_active_head.next) != &CPU->timeout_active_head) {
-                        timeout_t *timeout = list_get_instance(cur, timeout_t, link);
+                while ((cur = list_first(&CPU->timeout_active_list)) != NULL) {
+                        timeout_t *timeout = list_get_instance(cur, timeout_t,
+                            link);
                         
                         irq_spinlock_lock(&timeout->lock, false);