Changeset 7329e6a in mainline for kernel/generic/src/main/main.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:

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

kernel/generic/src/main/main.c

@@ -183 +183 @@
         version_print();
         
-        LOG("\nconfig.base=%p config.kernel_size=%" PRIs
-            "\nconfig.stack_base=%p config.stack_size=%" PRIs,
+        LOG("\nconfig.base=%p config.kernel_size=%zu"
+            "\nconfig.stack_base=%p config.stack_size=%zu",
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
@@ -225 +225 @@
         slab_enable_cpucache();
         
-        printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
+        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
             config.cpu_count, SIZE2MB(zones_total_size()));
         
@@ -241 +241 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIs "].addr=%p, init[%" PRIs
-                            "].size=%" PRIs, i, init.tasks[i].addr, i,
-                            init.tasks[i].size);
+                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
+                            i, init.tasks[i].addr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");