Changeset 0773396 in mainline for kernel/generic/src/proc/thread.c
- Timestamp:
- 2013-12-25T13:05:25Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- bc54126c
- Parents:
- f4a47e52 (diff), 6946f23 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/proc/thread.c
rf4a47e52 r0773396 192 192 kmflags &= ~FRAME_HIGHMEM; 193 193 194 thread->kstack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | kmflags); 195 if (!thread->kstack) { 194 uintptr_t stack_phys = 195 frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1); 196 if (!stack_phys) { 196 197 #ifdef CONFIG_FPU 197 198 if (thread->saved_fpu_context) … … 201 202 } 202 203 204 thread->kstack = (uint8_t *) PA2KA(stack_phys); 205 203 206 #ifdef CONFIG_UDEBUG 204 207 mutex_initialize(&thread->udebug.lock, MUTEX_PASSIVE); … … 216 219 thr_destructor_arch(thread); 217 220 218 frame_free(KA2PA(thread->kstack) );221 frame_free(KA2PA(thread->kstack), STACK_FRAMES); 219 222 220 223 #ifdef CONFIG_FPU
Note:
See TracChangeset
for help on using the changeset viewer.