Changeset d3dfa42 in mainline

Timestamp:

2006-03-12T22:15:13Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9bda3af6

Parents:

2cc5e050

Message:

Fix frame deallocation.
Zone state is to be upadated only when the frame refcount reaches zero.

Location:

generic

Files:

• include/mm/frame.h (modified) (1 diff)
• src/mm/frame.c (modified) (6 diffs)

generic/include/mm/frame.h

@@ -99 +99 @@
 
 extern void frame_init(void);
-__address frame_alloc_generic(__u8 order, int flags, int * status, int *pzone);
-extern void frame_free(__address addr);
+extern pfn_t frame_alloc_generic(__u8 order, int flags, int * status, int *pzone);
+extern void frame_free(pfn_t pfn);
 
 extern int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags);

generic/src/mm/frame.c

@@ -311 +311 @@
         }
         
-
         if (frame_index_valid(zone, index)) {
                 if (zone->frames[index].buddy_order == frame->buddy_order && 
@@ -470 +469 @@
         if (!--frame->refcount) {
                 buddy_system_free(zone->buddy_system, &frame->buddy_link);
-        }
-
-        /* Update zone information. */
-        zone->free_count += (1 << order);
-        zone->busy_count -= (1 << order);
+        
+                /* Update zone information. */
+                zone->free_count += (1 << order);
+                zone->busy_count -= (1 << order);
+        }
 }
 
@@ -601 +600 @@
         }
 }
-
 
 /** Reduce allocated block to count of order 0 frames
@@ -709 +707 @@
 }
 
-
 /**
  * Merge all zones into one big zone
@@ -773 +770 @@
 }
 
-
 /** Compute configuration data size for zone */
 __address zone_conf_size(count_t count)
@@ -784 +780 @@
         return size;
 }
-
 
 /** Create and add zone to system