Changeset 98000fb in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

File:

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

kernel/generic/src/mm/slab.c

@@ -157 +157 @@
         link_t link;            /**< List of full/partial slabs. */
         void *start;            /**< Start address of first available item. */
-        count_t available;      /**< Count of available items in this slab. */
-        index_t nextavail;      /**< The index of next available item. */
+        size_t available;       /**< Count of available items in this slab. */
+        size_t nextavail;       /**< The index of next available item. */
 } slab_t;
 
@@ -178 +178 @@
         size_t fsize;
         unsigned int i;
-        count_t zone = 0;
+        size_t zone = 0;
         
         data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
@@ -216 +216 @@
  * @return number of freed frames
  */
-static count_t slab_space_free(slab_cache_t *cache, slab_t *slab)
+static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
         frame_free(KA2PA(slab->start));
@@ -244 +244 @@
  * @return Number of freed pages
  */
-static count_t slab_obj_destroy(slab_cache_t *cache, void *obj, slab_t *slab)
+static size_t slab_obj_destroy(slab_cache_t *cache, void *obj, slab_t *slab)
 {
         int freed = 0;
@@ -372 +372 @@
  * @return Number of freed pages
  */
-static count_t magazine_destroy(slab_cache_t *cache, slab_magazine_t *mag)
+static size_t magazine_destroy(slab_cache_t *cache, slab_magazine_t *mag)
 {
         unsigned int i;
-        count_t frames = 0;
+        size_t frames = 0;
 
         for (i = 0; i < mag->busy; i++) {
@@ -650 +650 @@
  * @return Number of freed pages
  */
-static count_t _slab_reclaim(slab_cache_t *cache, int flags)
+static size_t _slab_reclaim(slab_cache_t *cache, int flags)
 {
         unsigned int i;
         slab_magazine_t *mag;
-        count_t frames = 0;
+        size_t frames = 0;
         int magcount;
         
@@ -772 +772 @@
 
 /* Go through all caches and reclaim what is possible */
-count_t slab_reclaim(int flags)
+size_t slab_reclaim(int flags)
 {
         slab_cache_t *cache;
         link_t *cur;
-        count_t frames = 0;
+        size_t frames = 0;
 
         spinlock_lock(&slab_cache_lock);