Changeset 15d0046 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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

File:

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

kernel/generic/src/proc/program.c

@@ -91 +91 @@
         if (!area) {
                 task_destroy(prg->task);
+                prg->task = NULL;
                 return ENOMEM;
         }
@@ -113 +114 @@
                 as_area_destroy(as, virt);
                 task_destroy(prg->task);
+                prg->task = NULL;
                 return ELIMIT;
         }