Changes in kernel/generic/src/proc/task.c [dd8d5a7:97d17fe] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (4 diffs)

kernel/generic/src/proc/task.c

@@ -290 +290 @@
 }
 
-#ifdef __32_BITS__
-
-/** Syscall for reading task ID from userspace (32 bits)
- *
- * @param uspace_taskid Pointer to user-space buffer
- *                      where to store current task ID.
+/** Syscall for reading task ID from userspace.
+ *
+ * @param uspace_task_id Userspace address of 8-byte buffer
+ *                       where to store current task ID.
  *
  * @return Zero on success or an error code from @ref errno.h.
  *
  */
-sysarg_t sys_task_get_id(sysarg64_t *uspace_taskid)
+unative_t sys_task_get_id(task_id_t *uspace_task_id)
 {
         /*
@@ -306 +304 @@
          * the lifespan of the task.
          */
-        return (sysarg_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
+        return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
             sizeof(TASK->taskid));
 }
-
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-/** Syscall for reading task ID from userspace (64 bits)
- *
- * @return Current task ID.
- *
- */
-sysarg_t sys_task_get_id(void)
-{
-        /*
-         * No need to acquire lock on TASK because taskid remains constant for
-         * the lifespan of the task.
-         */
-        return TASK->taskid;
-}
-
-#endif  /* __64_BITS__ */
 
 /** Syscall for setting the task name.
@@ -340 +318 @@
  *
  */
-sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
+unative_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
         int rc;
@@ -352 +330 @@
         rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (sysarg_t) rc;
+                return (unative_t) rc;
         
         namebuf[name_len] = '\0';