Changeset 80cd7cd in mainline for kernel/generic/src/main/main.c

Timestamp:

2011-01-13T20:58:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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) (2 diffs)

kernel/generic/src/main/main.c

@@ -185 +185 @@
         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);
+            (void *) config.base, config.kernel_size,
+            (void *) config.stack_base, config.stack_size);
         
 #ifdef CONFIG_KCONSOLE
@@ -242 +242 @@
                 for (i = 0; i < init.cnt; i++)
                         LOG("init[%zu].addr=%p, init[%zu].size=%zu",
-                            i, init.tasks[i].addr, i, init.tasks[i].size);
+                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");