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

Timestamp:

2011-06-01T09:04:08Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

Location:

kernel/generic/include/proc

Files:

• task.h (modified) (1 diff)
• thread.h (modified) (1 diff)
• uarg.h (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -78 +78 @@
         /** Unique identity of task. */
         task_id_t taskid;
-        /** Task security context. */
-        context_id_t context;
+        /** Task security container. */
+        container_id_t container;
         
         /** Number of references (i.e. threads). */

kernel/generic/include/proc/thread.h

@@ -49 +49 @@
 #include <sysinfo/abi.h>
 
-#define THREAD_STACK_SIZE   STACK_SIZE
 #define THREAD_NAME_BUFLEN  20
 

kernel/generic/include/proc/uarg.h

@@ -40 +40 @@
         void *uspace_entry;
         void *uspace_stack;
-
+        
         void (* uspace_thread_function)();
         void *uspace_thread_arg;