Changeset 97c7682 in mainline for uspace/srv/loader/main.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/srv/loader/main.c (modified) (1 diff)

uspace/srv/loader/main.c

@@ -450 +450 @@
         int rc = ns_intro(id);
         if (rc != EOK)
-                return -1;
+                return rc;
         
         /* Register at naming service. */
-        if (service_register(SERVICE_LOAD) != EOK)
-                return -2;
+        rc = service_register(SERVICE_LOAD);
+        if (rc != EOK)
+                return rc;
         
         async_manager();