Changeset bb68433 in mainline for generic/src/mm/slab.c

Timestamp:

2006-02-08T22:58:06Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7e4e532

Parents:

85dc2e7

Message:

Changed malloc to include second parameter and documented
recommended usage.
Added zone merging, made ia32 & amd64 to merge found zones.

File:

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

generic/src/mm/slab.c

@@ -543 +543 @@
         ASSERT(_slab_initialized >= 2);
 
-        cache->mag_cache = kalloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
+        cache->mag_cache = malloc(sizeof(slab_mag_cache_t)*config.cpu_count,0);
         for (i=0; i < config.cpu_count; i++) {
                 memsetb((__address)&cache->mag_cache[i],
@@ -706 +706 @@
 
         if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))
-                kfree(cache->mag_cache);
+                free(cache->mag_cache);
         slab_free(&slab_cache_cache, cache);
 }
@@ -872 +872 @@
 /**************************************/
 /* kalloc/kfree functions             */
-void * kalloc(unsigned int size, int flags)
+void * malloc(unsigned int size, int flags)
 {
         int idx;
@@ -888 +888 @@
 
 
-void kfree(void *obj)
+void free(void *obj)
 {
         slab_t *slab;