Changeset 3e828ea in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

kernel/generic/src/main/kinit.c

@@ -291 +291 @@
                         log(LF_OTHER, LVL_ERROR,
                             "init[%zu]: Init binary load failed "
-                            "(error %s, loader status %u)", i,
-                            str_error_name(rc), programs[i].loader_status);
+                            "(error %s, loader status %s)", i,
+                            str_error_name(rc), str_error_name(programs[i].loader_status));
                 }
         }