Changes in kernel/generic/src/mm/slab.c [7a0359b:ccb426c] in mainline

File:

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

kernel/generic/src/mm/slab.c

@@ -177 +177 @@
  *
  */
-NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
-    unsigned int flags)
+static slab_t *slab_space_alloc(slab_cache_t *cache, unsigned int flags)
 {
         
@@ -225 +224 @@
  *
  */
-NO_TRACE static size_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));
@@ -237 +236 @@
 
 /** Map object to slab structure */
-NO_TRACE static slab_t *obj2slab(void *obj)
+static slab_t *obj2slab(void *obj)
 {
         return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
@@ -253 +252 @@
  *
  */
-NO_TRACE static size_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)
 {
         if (!slab)
@@ -295 +293 @@
  *
  */
-NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
+static void *slab_obj_create(slab_cache_t *cache, int flags)
 {
         spinlock_lock(&cache->slablock);
@@ -351 +349 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
-    bool first)
+static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache, bool first)
 {
         slab_magazine_t *mag = NULL;
@@ -376 +373 @@
  *
  */
-NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
-    slab_magazine_t *mag)
+static void put_mag_to_cache(slab_cache_t *cache, slab_magazine_t *mag)
 {
         spinlock_lock(&cache->maglock);
@@ -392 +388 @@
  *
  */
-NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
-    slab_magazine_t *mag)
+static size_t magazine_destroy(slab_cache_t *cache, slab_magazine_t *mag)
 {
         size_t i;
@@ -411 +406 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
+static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
 {
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
         slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last;
-        
+
         ASSERT(spinlock_locked(&cache->mag_cache[CPU->id].lock));
         
@@ -448 +443 @@
  *
  */
-NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
+static void *magazine_obj_get(slab_cache_t *cache)
 {
         if (!CPU)
@@ -478 +473 @@
  *
  */
-NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
+static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
 {
         slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -484 +479 @@
         
         ASSERT(spinlock_locked(&cache->mag_cache[CPU->id].lock));
-        
+
         if (cmag) {
                 if (cmag->busy < cmag->size)
@@ -528 +523 @@
  *
  */
-NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
+static int magazine_obj_put(slab_cache_t *cache, void *obj)
 {
         if (!CPU)
@@ -557 +552 @@
  *
  */
-NO_TRACE static size_t comp_objects(slab_cache_t *cache)
+static size_t comp_objects(slab_cache_t *cache)
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -569 +564 @@
  *
  */
-NO_TRACE static size_t badness(slab_cache_t *cache)
+static size_t badness(slab_cache_t *cache)
 {
         size_t objects = comp_objects(cache);
@@ -583 +578 @@
  *
  */
-NO_TRACE static bool make_magcache(slab_cache_t *cache)
+static bool make_magcache(slab_cache_t *cache)
 {
         ASSERT(_slab_initialized >= 2);
@@ -605 +600 @@
  *
  */
-NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
+static void _slab_cache_create(slab_cache_t *cache, const char *name,
     size_t size, size_t align, int (*constructor)(void *obj,
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
@@ -681 +676 @@
  *
  */
-NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
+static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
 {
         if (cache->flags & SLAB_CACHE_NOMAGAZINE)
@@ -786 +781 @@
  *
  */
-NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
+static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
         ipl_t ipl = interrupts_disable();