Changeset 3f03199 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/generic/src/mm/as.c (modified) (10 diffs)

kernel/generic/src/mm/as.c

@@ -488 +488 @@
         
         /* Eventually check the addresses behind each area */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
                 
                 for (btree_key_t i = 0; i < node->keys; i++) {
@@ -672 +670 @@
         
         return NULL;
-}
-
-/** UGLY! UGLY! UGLY! */
-// TODO: REMOVE ASAP!
-as_area_t * find_locked_area(as_t *as, uintptr_t va)
-{
-        return find_area_and_lock(as, va);
 }
 
@@ -911 +902 @@
                  * reference from all frames found there.
                  */
-                list_foreach(sh_info->pagemap.leaf_list, cur) {
-                        btree_node_t *node
-                            = list_get_instance(cur, btree_node_t, leaf_link);
+                list_foreach(sh_info->pagemap.leaf_list, leaf_link,
+                    btree_node_t, node) {
                         btree_key_t i;
                         
                         for (i = 0; i < node->keys; i++)
-                                frame_free((uintptr_t) node->value[i]);
+                                frame_free((uintptr_t) node->value[i], 1);
                 }
                 
@@ -963 +953 @@
          * Visit only the pages mapped by used_space B+tree.
          */
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node;
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
-                node = list_get_instance(cur, btree_node_t, leaf_link);
                 for (i = 0; i < node->keys; i++) {
                         uintptr_t ptr = node->key[i];
@@ -1245 +1234 @@
         size_t used_pages = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -1271 +1259 @@
         size_t frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node = list_get_instance(cur, btree_node_t,
-                    leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -1323 +1310 @@
         frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -2189 +2175 @@
         size_t area_cnt = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 area_cnt += node->keys;
         }
@@ -2202 +2187 @@
         size_t area_idx = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node =
-                    list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;
                 
@@ -2238 +2222 @@
         
         /* Print out info about address space areas */
-        list_foreach(as->as_area_btree.leaf_list, cur) {
-                btree_node_t *node
-                    = list_get_instance(cur, btree_node_t, leaf_link);
+        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
+            node) {
                 btree_key_t i;