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

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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) (2 diffs)

kernel/generic/src/mm/slab.c

@@ -829 +829 @@
 void slab_print_list(void)
 {
-        printf("slab name        size     pages  obj/pg   slabs  cached allocated"
-            " ctl\n");
-        printf("---------------- -------- ------ -------- ------ ------ ---------"
-            " ---\n");
+        printf("[slab name       ] [size  ] [pages ] [obj/pg] [slabs ]"
+            " [cached] [alloc ] [ctl]\n");
         
         size_t skip = 0;
@@ -887 +885 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-16s %8" PRIs " %6u %8" PRIs " %6ld %6ld %9ld %-3s\n",
+                printf("%-18s %8" PRIs " %8u %8" PRIs " %8ld %8ld %8ld %-5s\n",
                     name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,