Changeset ca21f1e2 in mainline

Timestamp:

2018-11-22T17:09:51Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3612e9f, 392f0e7, 3aa24ae8, d708088

Parents:

21d3201

git-author:

Jakub Jermar <jakub@…> (2018-11-22 17:09:47)

git-committer:

Jakub Jermar <jakub@…> (2018-11-22 17:09:51)

Message:

Provide only one way to destroy address spaces

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/proc/program.c (modified) (3 diffs)

kernel/generic/include/mm/as.h

@@ -268 +268 @@
 
 extern as_t *as_create(unsigned int);
-extern void as_destroy(as_t *);
 extern void as_hold(as_t *);
 extern void as_release(as_t *);

kernel/generic/src/mm/as.c

@@ -187 +187 @@
  *
  */
-void as_destroy(as_t *as)
+static void as_destroy(as_t *as)
 {
         DEADLOCK_PROBE_INIT(p_asidlock);

kernel/generic/src/proc/program.c

@@ -150 +150 @@
         prg->loader_status = elf_load((elf_header_t *) image_addr, as);
         if (prg->loader_status != EE_OK) {
-                as_destroy(as);
+                as_release(as);
                 prg->task = NULL;
                 prg->main_thread = NULL;
@@ -176 +176 @@
         void *loader = program_loader;
         if (!loader) {
-                as_destroy(as);
+                as_release(as);
                 log(LF_OTHER, LVL_ERROR,
                     "Cannot spawn loader as none was registered");
@@ -184 +184 @@
         prg->loader_status = elf_load((elf_header_t *) program_loader, as);
         if (prg->loader_status != EE_OK) {
-                as_destroy(as);
+                as_release(as);
                 log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
                     elf_error(prg->loader_status));