Changeset e6a78b9 in mainline for kernel/test/mm/slab2.c

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/test/mm/slab2.c (modified) (2 diffs)

kernel/test/mm/slab2.c

@@ -52 +52 @@
         void *olddata1 = NULL, *olddata2 = NULL;
         
-        cache1 = slab_cache_create("cache1_tst", ITEM_SIZE, 0, NULL, NULL, 0);
-        cache2 = slab_cache_create("cache2_tst", ITEM_SIZE, 0, NULL, NULL, 0);
+        cache1 = slab_cache_create("test_cache1", ITEM_SIZE, 0, NULL, NULL, 0);
+        cache2 = slab_cache_create("test_cache2", ITEM_SIZE, 0, NULL, NULL, 0);
         
         TPRINTF("Allocating...");
@@ -210 +210 @@
         thr_cache = slab_cache_create("thread_cache", size, 0, NULL, NULL, 0);
         semaphore_initialize(&thr_sem,0);
-        for (i = 0; i < THREADS; i++) {  
-                if (!(t = thread_create(slabtest, NULL, TASK, 0, "slabtest", false))) {
+        for (i = 0; i < THREADS; i++) {
+                if (!(t = thread_create(slabtest, NULL, TASK, THREAD_FLAG_NONE, "slabtest"))) {
                         TPRINTF("Could not create thread %d\n", i);
                 } else