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

Timestamp:

2011-06-18T15:35:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/generic/src/mm/slab.c

@@ -317 +317 @@
                 spinlock_lock(&cache->slablock);
         } else {
-                slab = list_get_instance(cache->partial_slabs.next, slab_t,
-                    link);
+                slab = list_get_instance(list_first(&cache->partial_slabs),
+                    slab_t, link);
                 list_remove(&slab->link);
         }
@@ -360 +360 @@
         if (!list_empty(&cache->magazines)) {
                 if (first)
-                        cur = cache->magazines.next;
+                        cur = list_first(&cache->magazines);
                 else
-                        cur = cache->magazines.prev;
+                        cur = list_last(&cache->magazines);
                 
                 mag = list_get_instance(cur, slab_magazine_t, link);
@@ -812 +812 @@
         
         size_t frames = 0;
-        link_t *cur;
-        for (cur = slab_cache_list.next; cur != &slab_cache_list;
-            cur = cur->next) {
+        list_foreach(slab_cache_list, cur) {
                 slab_cache_t *cache = list_get_instance(cur, slab_cache_t, link);
                 frames += _slab_reclaim(cache, flags);
@@ -861 +859 @@
                 link_t *cur;
                 size_t i;
-                for (i = 0, cur = slab_cache_list.next;
-                    (i < skip) && (cur != &slab_cache_list);
+                for (i = 0, cur = slab_cache_list.head.next;
+                    (i < skip) && (cur != &slab_cache_list.head);
                     i++, cur = cur->next);
                 
-                if (cur == &slab_cache_list) {
+                if (cur == &slab_cache_list.head) {
                         irq_spinlock_unlock(&slab_cache_lock, true);
                         break;
@@ -940 +938 @@
         irq_spinlock_lock(&slab_cache_lock, false);
         
-        link_t *cur;
-        for (cur = slab_cache_list.next; cur != &slab_cache_list;
-            cur = cur->next) {
+        list_foreach(slab_cache_list, cur) {
                 slab_cache_t *slab = list_get_instance(cur, slab_cache_t, link);
                 if ((slab->flags & SLAB_CACHE_MAGDEFERRED) !=