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

Timestamp:

2013-09-11T11:56:39Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1db5669

Parents:

43dd8028

Message:

due to the removal of FRAME_KA, the return value of frame_alloc*() needs to be checked before converting the physical address to kernel address

File:

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

kernel/generic/src/proc/thread.c

@@ -192 +192 @@
         kmflags &= ~FRAME_HIGHMEM;
         
-        thread->kstack = (uint8_t *)
-            PA2KA(frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1));
-        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 +201 @@
                 return -1;
         }
+        
+        thread->kstack = (uint8_t *) PA2KA(stack_phys);
         
 #ifdef CONFIG_UDEBUG