Changeset 7329e6a in mainline for uspace/app/tasks/tasks.c

Timestamp:

2010-11-29T19:22:58Z (13 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:

• uspace/app/tasks/tasks.c (modified) (2 diffs)

uspace/app/tasks/tasks.c

@@ -77 +77 @@
                 order_suffix(stats_tasks[i].kcycles, &kcycles, &ksuffix);
                 
-                printf("%8" PRIu64 "%8u %8" PRIu64"%c %12"
+                printf("%8" PRIu64 "%8zu %8" PRIu64 "%c %12"
                     PRIu64 "%c %12" PRIu64 "%c %s\n", stats_tasks[i].task_id,
                     stats_tasks[i].threads, virtmem, vmsuffix, ucycles, usuffix,
@@ -160 +160 @@
         }
         
-        printf("%s: %u CPU(s) detected\n", NAME, count);
+        printf("%s: %zu CPU(s) detected\n", NAME, count);
         
         size_t i;