Changeset 8b36bf2 in mainline for kernel/test/mm/slab2.c


Ignore:
Timestamp:
2012-06-20T23:03:29Z (12 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d5070ef
Parents:
8375d0eb (diff), 6eef3c4 (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/test/mm/slab2.c

    r8375d0eb r8b36bf2  
    5252        void *olddata1 = NULL, *olddata2 = NULL;
    5353       
    54         cache1 = slab_cache_create("cache1_tst", ITEM_SIZE, 0, NULL, NULL, 0);
    55         cache2 = slab_cache_create("cache2_tst", ITEM_SIZE, 0, NULL, NULL, 0);
     54        cache1 = slab_cache_create("test_cache1", ITEM_SIZE, 0, NULL, NULL, 0);
     55        cache2 = slab_cache_create("test_cache2", ITEM_SIZE, 0, NULL, NULL, 0);
    5656       
    5757        TPRINTF("Allocating...");
     
    210210        thr_cache = slab_cache_create("thread_cache", size, 0, NULL, NULL, 0);
    211211        semaphore_initialize(&thr_sem,0);
    212         for (i = 0; i < THREADS; i++) { 
    213                 if (!(t = thread_create(slabtest, NULL, TASK, 0, "slabtest", false))) {
     212        for (i = 0; i < THREADS; i++) {
     213                if (!(t = thread_create(slabtest, NULL, TASK, THREAD_FLAG_NONE, "slabtest"))) {
    214214                        TPRINTF("Could not create thread %d\n", i);
    215215                } else
Note: See TracChangeset for help on using the changeset viewer.