Changeset 99c2c69e in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2013-09-13T00:36:30Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

67fbd5e

Parents:

7f84430 (diff), 11d41be5 (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:

mainline changes

File:

• kernel/generic/src/proc/thread.c (modified) (3 diffs)

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