diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/main.c | 3 | ||||
| -rw-r--r-- | common/string.c | 1 | ||||
| -rw-r--r-- | common/uapi/ipc.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c index 7291387..478b2f5 100644 --- a/common/main.c +++ b/common/main.c @@ -57,5 +57,6 @@ void __main main(void *fdt, uintptr_t ram_base) smp_bringup(b, fdt); /* start running init program */ - run_init(cur_tcb(), fdt); + void *initrd = (void *)get_initrdbase(fdt); + run_init(cur_tcb(), fdt, initrd); } diff --git a/common/string.c b/common/string.c index 359a938..8c88e65 100644 --- a/common/string.c +++ b/common/string.c @@ -307,6 +307,7 @@ __weak void *memmove(void *dst, const void *src, size_t num) m1 += num; m2 += num; + /* doesn't really take into account aliasing yet */ while (num--) *(--m2) = *(--m1); diff --git a/common/uapi/ipc.c b/common/uapi/ipc.c index dc292ef..18c3b1a 100644 --- a/common/uapi/ipc.c +++ b/common/uapi/ipc.c @@ -79,7 +79,7 @@ static void finalize_rpc(struct tcb *t, struct tcb *r, vm_t s) * @return RPC stack difference that should be passed to finalize_rpc(). */ static vm_t enter_rpc(struct tcb *t, struct sys_ret a, - enum ipc_kind kind) + enum ipc_kind kind) { vm_t rpc_stack = rpc_position(t); |