Changeset df29f24 in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• kernel/arch/arm32/src/arm32.c (modified) (1 diff)

kernel/arch/arm32/src/arm32.c

@@ -134 +134 @@
         uint8_t *stck;
         
-        stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
+        stck = &THREAD->kstack[STACK_SIZE - SP_DELTA];
         supervisor_sp = (uintptr_t) stck;
 }