Changeset ebb1489 in mainline for kernel/generic/src/main

Timestamp:

2024-10-13T08:23:40Z (19 months ago)

Author:

GitHub <noreply@…>

Parents:

2a0c827c (diff), b3b79981 (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:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (1 diff)
• uinit.c (modified) (1 diff)

kernel/generic/src/main/kinit.c

@@ -296 +296 @@
                         }
 
-                } else if (i == init.cnt - 1) {
-                        /*
-                         * Assume the last task is the RAM disk.
-                         */
+                } else if (str_cmp(name, "initrd.img") == 0) {
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else {

kernel/generic/src/main/uinit.c

@@ -60 +60 @@
 #endif
 
-        uspace_arg_t *uarg = arg;
-        uspace_arg_t local_uarg;
-
-        local_uarg.uspace_entry = uarg->uspace_entry;
-        local_uarg.uspace_stack = uarg->uspace_stack;
-        local_uarg.uspace_stack_size = uarg->uspace_stack_size;
-        local_uarg.uspace_uarg = uarg->uspace_uarg;
-        local_uarg.uspace_thread_function = USPACE_NULL;
-        local_uarg.uspace_thread_arg = USPACE_NULL;
-
+        uinit_arg_t *uarg = arg;
+        sysarg_t pc = uarg->pc;
+        sysarg_t sp = uarg->sp;
         free(uarg);
 
-        userspace(&local_uarg);
+        userspace(pc, sp);
 }