Changeset 7329e6a in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2010-11-29T19:22:58Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5581b469

Parents:

3a4b3ba (diff), 41a7f62 (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/ipc/ipc.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -702 +702 @@
         for (i = 0; i < IPC_MAX_PHONES; i++) {
                 if (SYNCH_FAILED(mutex_trylock(&task->phones[i].lock))) {
-                        printf("%d: mutex busy\n", i);
+                        printf("%zu: mutex busy\n", i);
                         continue;
                 }
                 
                 if (task->phones[i].state != IPC_PHONE_FREE) {
-                        printf("%" PRIs ": ", i);
+                        printf("%zu: ", i);
                         
                         switch (task->phones[i].state) {