Changeset df29f24 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2011-06-01T09:04:08Z (14 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).

File:

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

kernel/generic/src/proc/task.c

@@ -190 +190 @@
         str_cpy(task->name, TASK_NAME_BUFLEN, name);
         
-        task->context = CONTEXT;
+        task->container = CONTAINER;
         task->capabilities = 0;
         task->ucycles = 0;
@@ -211 +211 @@
         
         if ((ipc_phone_0) &&
-            (context_check(ipc_phone_0->task->context, task->context)))
+            (container_check(ipc_phone_0->task->container, task->container)))
                 ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
@@ -584 +584 @@
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
                     " %9" PRIu64 "%c %9" PRIu64 "%c\n", task->taskid,
-                    task->name, task->context, task, task->as,
+                    task->name, task->container, task, task->as,
                     ucycles, usuffix, kcycles, ksuffix);
 #endif
@@ -595 +595 @@
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
-                    task->taskid, task->name, task->context, task, task->as);
+                    task->taskid, task->name, task->container, task, task->as);
 #endif
         
@@ -625 +625 @@
                 printf("[id    ] [threads] [calls] [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address ] [as      ]"
+                printf("[id    ] [name        ] [ctn] [address ] [as      ]"
                     " [ucycles ] [kcycles ]\n");
 #endif
@@ -634 +634 @@
                     " [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address         ]"
+                printf("[id    ] [name        ] [ctn] [address         ]"
                     " [as              ]\n");
 #endif