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

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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

@@ -612 +612 @@
         cache->name = name;
         
-        if (align < sizeof(unative_t))
-                align = sizeof(unative_t);
+        if (align < sizeof(sysarg_t))
+                align = sizeof(sysarg_t);
         
         size = ALIGN_UP(size, align);
@@ -890 +890 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8" PRIs " %8u %8" PRIs " %8ld %8ld %8ld %-5s\n",
+                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
                     name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,