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

Timestamp:

2010-12-17T10:14:01Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

File:

• kernel/generic/src/mm/slab.c (modified) (1 diff)

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);