Changeset 0c2d9bb in mainline for kernel/generic/src/proc

Timestamp:

2013-12-25T22:54:29Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/src/proc

Files:

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

kernel/generic/src/proc/scheduler.c

@@ -741 +741 @@
                         
                         printf("\trq[%u]: ", i);
-                        list_foreach(cpus[cpu].rq[i].rq, cur) {
-                                thread_t *thread = list_get_instance(cur,
-                                    thread_t, rq_link);
+                        list_foreach(cpus[cpu].rq[i].rq, rq_link, thread_t,
+                            thread) {
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);

kernel/generic/src/proc/task.c

@@ -452 +452 @@
         
         /* Current values of threads */
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
-                
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 irq_spinlock_lock(&thread->lock, false);
                 
@@ -484 +482 @@
          */
         
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 bool sleeping = false;
                 

kernel/generic/src/proc/thread.c

@@ -192 +192 @@
         kmflags &= ~FRAME_HIGHMEM;
         
-        thread->kstack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
-        if (!thread->kstack) {
+        uintptr_t stack_phys =
+            frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1);
+        if (!stack_phys) {
 #ifdef CONFIG_FPU
                 if (thread->saved_fpu_context)
@@ -201 +202 @@
         }
         
+        thread->kstack = (uint8_t *) PA2KA(stack_phys);
+        
 #ifdef CONFIG_UDEBUG
         mutex_initialize(&thread->udebug.lock, MUTEX_PASSIVE);
@@ -216 +219 @@
         thr_destructor_arch(thread);
         
-        frame_free(KA2PA(thread->kstack));
+        frame_free(KA2PA(thread->kstack), STACK_FRAMES);
         
 #ifdef CONFIG_FPU