Changeset 2e9eae2 in mainline for generic/src/mm/slab.c

Timestamp:

2006-06-23T16:03:53Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

757551a3

Parents:

a832dd7

Message:

Changed interface of frame_alloc/free to use address of frame instead of the pfn.
This makes it impossible to use >4GB of memory on 32-bit machines, but who cares…

File:

• generic/src/mm/slab.c (modified) (4 diffs)

generic/src/mm/slab.c

@@ -163 +163 @@
         int i;
         int status;
-        pfn_t pfn;
         int zone=0;
         
-        pfn = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
-        data = (void *) PA2KA(PFN2ADDR(pfn));
+        data = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
         if (status != FRAME_OK) {
                 return NULL;
@@ -174 +172 @@
                 slab = slab_alloc(slab_extern_cache, flags);
                 if (!slab) {
-                        frame_free(ADDR2PFN(KA2PA(data)));
+                        frame_free(KA2PA(data));
                         return NULL;
                 }
@@ -184 +182 @@
         /* Fill in slab structures */
         for (i=0; i < (1 << cache->order); i++)
-                frame_set_parent(pfn+i, slab, zone);
+                frame_set_parent(ADDR2PFN(KA2PA(data))+i, slab, zone);
 
         slab->start = data;
@@ -205 +203 @@
 static count_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
-        frame_free(ADDR2PFN(KA2PA(slab->start)));
+        frame_free(KA2PA(slab->start));
         if (! (cache->flags & SLAB_CACHE_SLINSIDE))
                 slab_free(slab_extern_cache, slab);