Changeset bd08239 in mainline for kernel/generic/include/proc

Timestamp:

2011-06-18T15:35:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (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

Location:

kernel/generic/include/proc

Files:

• scheduler.h (modified) (1 diff)
• task.h (modified) (2 diffs)

kernel/generic/include/proc/scheduler.h

@@ -48 +48 @@
 typedef struct {
         IRQ_SPINLOCK_DECLARE(lock);
-        link_t rq_head;              /**< List of ready threads. */
-        size_t n;                    /**< Number of threads in rq_ready. */
+        list_t rq;                      /**< List of ready threads. */
+        size_t n;                       /**< Number of threads in rq_ready. */
 } runq_t;
 

kernel/generic/include/proc/task.h

@@ -73 +73 @@
         char name[TASK_NAME_BUFLEN];
         /** List of threads contained in this task. */
-        link_t th_head;
+        list_t threads;
         /** Address space. */
         as_t *as;
@@ -94 +94 @@
         stats_ipc_t ipc_info;   /**< IPC statistics */
         /** List of synchronous answerboxes. */
-        link_t sync_box_head;
+        list_t sync_boxes;
         
 #ifdef CONFIG_UDEBUG