Changeset 26e7d6d in mainline for kernel/generic/include/proc/task.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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) (3 diffs)

kernel/generic/include/proc/task.h

@@ -38 +38 @@
 #include <cpu.h>
 #include <ipc/ipc.h>
+#include <ipc/event.h>
+#include <ipc/kbox.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
@@ -53 +55 @@
 #include <proc/scheduler.h>
 #include <udebug/udebug.h>
-#include <ipc/kbox.h>
 #include <mm/as.h>
-#include <sysinfo/abi.h>
+#include <abi/sysinfo.h>
 
 struct thread;
@@ -93 +94 @@
         phone_t phones[IPC_MAX_PHONES];
         stats_ipc_t ipc_info;   /**< IPC statistics */
-        /** List of synchronous answerboxes. */
-        list_t sync_boxes;
+        list_t sync_boxes;      /**< List of synchronous answerboxes. */
+        event_t events[EVENT_TASK_END - EVENT_END];
         
 #ifdef CONFIG_UDEBUG