Changes in kernel/generic/src/mm/as.c [5df1963:2c0b348] in mainline

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, leaf_link, btree_node_t, node) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
+                btree_node_t *node =
+                    list_get_instance(cur, btree_node_t, leaf_link);
                 
                 for (btree_key_t i = 0; i < node->keys; i++) {
@@ -670 +672 @@
         
         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);
 }
 
@@ -902 +911 @@
                  * reference from all frames found there.
                  */
-                list_foreach(sh_info->pagemap.leaf_list, leaf_link,
-                    btree_node_t, node) {
+                list_foreach(sh_info->pagemap.leaf_list, cur) {
+                        btree_node_t *node
+                            = list_get_instance(cur, btree_node_t, leaf_link);
                         btree_key_t i;
                         
                         for (i = 0; i < node->keys; i++)
-                                frame_free((uintptr_t) node->value[i], 1);
+                                frame_free((uintptr_t) node->value[i]);
                 }
                 
@@ -953 +963 @@
          * Visit only the pages mapped by used_space B+tree.
          */
-        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(area->used_space.leaf_list, cur) {
+                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];
@@ -1234 +1245 @@
         size_t used_pages = 0;
         
-        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(area->used_space.leaf_list, cur) {
+                btree_node_t *node
+                    = list_get_instance(cur, btree_node_t, leaf_link);
                 btree_key_t i;
                 
@@ -1259 +1271 @@
         size_t frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(area->used_space.leaf_list, cur) {
+                btree_node_t *node = list_get_instance(cur, btree_node_t,
+                    leaf_link);
                 btree_key_t i;
                 
@@ -1310 +1323 @@
         frame_idx = 0;
         
-        list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(area->used_space.leaf_list, cur) {
+                btree_node_t *node
+                    = list_get_instance(cur, btree_node_t, leaf_link);
                 btree_key_t i;
                 
@@ -2175 +2189 @@
         size_t area_cnt = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
+                btree_node_t *node =
+                    list_get_instance(cur, btree_node_t, leaf_link);
                 area_cnt += node->keys;
         }
@@ -2187 +2202 @@
         size_t area_idx = 0;
         
-        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
+                btree_node_t *node =
+                    list_get_instance(cur, btree_node_t, leaf_link);
                 btree_key_t i;
                 
@@ -2222 +2238 @@
         
         /* Print out info about address space areas */
-        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
+                btree_node_t *node
+                    = list_get_instance(cur, btree_node_t, leaf_link);
                 btree_key_t i;