Changeset 8e7c9fe in mainline for kernel/generic/src/mm/backend_anon.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/generic/src/mm/backend_anon.c (modified) (6 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -76 +76 @@
         .page_fault = anon_page_fault,
         .frame_free = anon_frame_free,
+
+        .create_shared_data = NULL,
+        .destroy_shared_data = NULL
 };
 
@@ -190 +193 @@
                 return AS_PF_FAULT;
 
-        if (area->sh_info) {
+        mutex_lock(&area->sh_info->lock);
+        if (area->sh_info->shared) {
                 btree_node_t *leaf;
                 
@@ -200 +204 @@
                  * mapping, a new frame is allocated and the mapping is created.
                  */
-                mutex_lock(&area->sh_info->lock);
                 frame = (uintptr_t) btree_search(&area->sh_info->pagemap,
                     upage - area->base, &leaf);
@@ -232 +235 @@
                 }
                 frame_reference_add(ADDR2PFN(frame));
-                mutex_unlock(&area->sh_info->lock);
         } else {
 
@@ -254 +256 @@
                          * Reserve the memory for this page now.
                          */
-                        if (!reserve_try_alloc(1))
+                        if (!reserve_try_alloc(1)) {
+                                mutex_unlock(&area->sh_info->lock);
                                 return AS_PF_SILENT;
+                        }
                 }
 
@@ -262 +266 @@
                 km_temporary_page_put(kpage);
         }
+        mutex_unlock(&area->sh_info->lock);
         
         /*