Changeset bbe7848 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• kernel/generic/src/proc/task.c (modified) (3 diffs)

kernel/generic/src/proc/task.c

@@ -478 +478 @@
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9lu %7lu", task->taskid,
+                printf("%-8" PRIu64 " %9" PRIua " %7" PRIua, task->taskid,
                     atomic_get(&task->refcount), atomic_get(&task->active_calls));
         else
@@ -489 +489 @@
 #ifdef __64_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c %9lu %7lu",
+                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
+                    "%9" PRIua " %7" PRIua,
                     task->taskid, ucycles, usuffix, kcycles, ksuffix,
                     atomic_get(&task->refcount), atomic_get(&task->active_calls));
@@ -501 +502 @@
                 for (i = 0; i < IPC_MAX_PHONES; i++) {
                         if (task->phones[i].callee)
-                                printf(" %" PRIs ":%p", i, task->phones[i].callee);
+                                printf(" %zu:%p", i, task->phones[i].callee);
                 }
                 printf("\n");