Changeset 7bdcc45 in mainline for kernel/generic/include/proc/task.h

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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:

• kernel/generic/include/proc/task.h (modified) (2 diffs)

kernel/generic/include/proc/task.h

@@ -93 +93 @@
         phone_t phones[IPC_MAX_PHONES];
         stats_ipc_t ipc_info;   /**< IPC statistics */
-        /**
-         * Active asynchronous messages. It is used for limiting uspace to
-         * certain extent.
-         */
-        atomic_t active_calls;
         /** List of synchronous answerboxes. */
         link_t sync_box_head;
@@ -150 +145 @@
 #endif
 
-extern unative_t sys_task_get_id(task_id_t *);
-extern unative_t sys_task_set_name(const char *, size_t);
+#ifdef __32_BITS__
+extern sysarg_t sys_task_get_id(sysarg64_t *);
+#endif
+
+#ifdef __64_BITS__
+extern sysarg_t sys_task_get_id(void);
+#endif
+
+extern sysarg_t sys_task_set_name(const char *, size_t);
 
 #endif