Changeset 8e7c9fe in mainline for kernel/generic/include/mm/as.h

Timestamp:

2014-09-12T03:45:25Z (11 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/include/mm/as.h (modified) (3 diffs)

kernel/generic/include/mm/as.h

@@ -140 +140 @@
         /** This structure can be deallocated if refcount drops to 0. */
         size_t refcount;
-        
+        /** True if the area has been ever shared. */
+        bool shared;
+
         /**
          * B+tree containing complete map of anonymous pages of the shared area.
          */
         btree_t pagemap;
+
+        /** Address space area backend. */
+        struct mem_backend *backend;
+        /** Address space area shared data. */
+        void *backend_shared_data;
 } share_info_t;
 
@@ -169 +176 @@
                 uintptr_t base;
                 size_t frames;
+                bool anonymous;
         };
 } mem_backend_data_t;
@@ -226 +234 @@
         int (* page_fault)(as_area_t *, uintptr_t, pf_access_t);
         void (* frame_free)(as_area_t *, uintptr_t, uintptr_t);
+
+        bool (* create_shared_data)(as_area_t *);
+        void (* destroy_shared_data)(void *);
 } mem_backend_t;