Changeset f798178 in mainline for uspace/srv/loader/main.c

Timestamp:

2011-04-30T13:44:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4ddbea7

Parents:

a71d2630 (diff), 3f461ecf (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:

• uspace/srv/loader/main.c (modified) (3 diffs)

uspace/srv/loader/main.c

@@ -55 +55 @@
 #include <macros.h>
 #include <loader/pcb.h>
+#include <entry_point.h>
 #include <errno.h>
 #include <async.h>
@@ -71 +72 @@
 #define DPRINTF(...)
 
-void program_run(void *entry, pcb_t *pcb);
 static int ldr_load_dyn_linked(elf_info_t *p_info);
 
@@ -394 +394 @@
         async_answer_0(rid, EOK);
         DPRINTF("Jump to entry point at %p\n", pcb.entry);
-        program_run(prog_info.entry, &pcb);
+        entry_point_jmp(prog_info.entry, &pcb);
         
         /* Not reached */