Changeset 8b863a62 in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/mm/backend_elf.c (modified) (7 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -75 +75 @@
         .page_fault = elf_page_fault,
         .frame_free = elf_frame_free,
+
+        .create_shared_data = NULL,
+        .destroy_shared_data = NULL
 };
 
@@ -274 +277 @@
         start_anon = entry->p_vaddr + entry->p_filesz;
 
-        if (area->sh_info) {
+        mutex_lock(&area->sh_info->lock);
+        if (area->sh_info->shared) {
                 bool found = false;
 
@@ -281 +285 @@
                  */
                 
-                mutex_lock(&area->sh_info->lock);
                 frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
                     upage - area->base, &leaf);
@@ -384 +387 @@
         }
 
-        if (dirty && area->sh_info) {
+        if (dirty && area->sh_info->shared) {
                 frame_reference_add(ADDR2PFN(frame));
                 btree_insert(&area->sh_info->pagemap, upage - area->base,
@@ -390 +393 @@
         }
 
-        if (area->sh_info)
-                mutex_unlock(&area->sh_info->lock);
+        mutex_unlock(&area->sh_info->lock);
 
         page_mapping_insert(AS, upage, frame, as_area_get_flags(area));
@@ -429 +431 @@
                          * data.
                          */
-                        frame_free_noreserve(frame);
+                        frame_free_noreserve(frame, 1);
                 }
         } else {
@@ -437 +439 @@
                  * anonymous). In any case, a frame needs to be freed.
                  */
-                frame_free_noreserve(frame);
+                frame_free_noreserve(frame, 1);
         }
 }