Changeset 7bdcc45 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/proc/scheduler.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -727 +727 @@
                 irq_spinlock_lock(&cpus[cpu].lock, true);
                 
-                printf("cpu%u: address=%p, nrdy=%ld, needs_relink=%" PRIs "\n",
+                printf("cpu%u: address=%p, nrdy=%" PRIua ", needs_relink=%zu\n",
                     cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
                     cpus[cpu].needs_relink);