Changeset df29f24 in mainline for kernel/generic/src/proc/the.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/generic/src/proc/the.c (modified) (2 diffs)

kernel/generic/src/proc/the.c

@@ -58 +58 @@
         the->task = NULL;
         the->as = NULL;
+        the->magic = MAGIC;
 }
 
@@ -70 +71 @@
 NO_TRACE void the_copy(the_t *src, the_t *dst)
 {
+        ASSERT(src->magic == MAGIC);
         *dst = *src;
 }