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


Ignore:
Timestamp:
2010-12-30T13:43:27Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/mm/slab.c

    rd70d80ed rea28272  
    612612        cache->name = name;
    613613       
    614         if (align < sizeof(unative_t))
    615                 align = sizeof(unative_t);
     614        if (align < sizeof(sysarg_t))
     615                align = sizeof(sysarg_t);
    616616       
    617617        size = ALIGN_UP(size, align);
Note: See TracChangeset for help on using the changeset viewer.