Changeset 856a36b in mainline for kernel/generic/src/main/main.c

Timestamp:

2012-02-18T08:26:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5c83612b

Parents:

cd00f93 (diff), c01bb5f9 (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 with mainline

File:

• kernel/generic/src/main/main.c (modified) (1 diff)

kernel/generic/src/main/main.c

@@ -257 +257 @@
                 for (i = 0; i < init.cnt; i++)
                         LOG("init[%zu].addr=%p, init[%zu].size=%zu",
-                            i, (void *) init.tasks[i].addr, i, init.tasks[i].size);
+                            i, (void *) init.tasks[i].paddr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");