Changeset aa85487 in mainline for kernel/generic/src/proc

Timestamp:

2010-03-07T15:11:56Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (1 diff)
• task.c (modified) (1 diff)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/scheduler.c

@@ -542 +542 @@
 {
         thread_t *t;
-        int count, average, j, k = 0;
+        int count;
+        atomic_count_t average;
         unsigned int i;
+        int j;
+        int k = 0;
         ipl_t ipl;
 

kernel/generic/src/proc/task.c

@@ -171 +171 @@
  *
  */
-task_t *task_create(as_t *as, char *name)
+task_t *task_create(as_t *as, const char *name)
 {
         ipl_t ipl;

kernel/generic/src/proc/thread.c

@@ -76 +76 @@
 
 /** Thread states */
-char *thread_states[] = {
+const char *thread_states[] = {
         "Invalid",
         "Running",
@@ -264 +264 @@
 
         atomic_inc(&nrdy);
+        // FIXME: Why is the avg value never read?
         avg = atomic_get(&nrdy) / config.cpu_active;
         atomic_inc(&cpu->nrdy);
@@ -288 +289 @@
  */
 thread_t *thread_create(void (* func)(void *), void *arg, task_t *task,
-    int flags, char *name, bool uncounted)
+    int flags, const char *name, bool uncounted)
 {
         thread_t *t;